Fix gzip/bz2 builds for Windows

4 files changed, 47 insertions, 47 deletions

diff --git a/ext/standard/file.c b/ext/standard/file.c
index fcd50a3cbd..616dba829e 100644
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -604,7 +604,7 @@ PHP_NAMED_FUNCTION(php_if_fopen)
 
 /* {{{ proto bool fclose(resource fp)
    Close an open file pointer */
-PHP_FUNCTION(fclose)
+PHPAPI PHP_FUNCTION(fclose)
 {
 	zval **arg1;
 	int type;
@@ -710,7 +710,7 @@ PHP_FUNCTION(pclose)
 
 /* {{{ proto bool feof(resource fp)
    Test for end-of-file on a file pointer */
-PHP_FUNCTION(feof)
+PHPAPI PHP_FUNCTION(feof)
 {
 	zval **arg1;
 	int type;
@@ -887,7 +887,7 @@ PHP_FUNCTION(socket_get_status)
 
 /* {{{ proto string fgets(resource fp[, int length])
    Get a line from file pointer */
-PHP_FUNCTION(fgets)
+PHPAPI PHP_FUNCTION(fgets)
 {
 	zval **arg1, **arg2;
 	int len = 1024, type;
@@ -939,7 +939,7 @@ exit_failed:
 
 /* {{{ proto string fgetc(resource fp)
    Get a character from file pointer */
-PHP_FUNCTION(fgetc)
+PHPAPI PHP_FUNCTION(fgetc)
 {
 	zval **arg1;
 	int type;
@@ -972,7 +972,7 @@ PHP_FUNCTION(fgetc)
 
 /* {{{ proto string fgetss(resource fp, int length [, string allowable_tags])
    Get a line from file pointer and strip HTML tags */
-PHP_FUNCTION(fgetss)
+PHPAPI PHP_FUNCTION(fgetss)
 {
 	zval **fd, **bytes, **allow=NULL;
 	int len, type;
@@ -1091,7 +1091,7 @@ PHP_FUNCTION(fscanf)
 
 /* {{{ proto int fwrite(resource fp, string str [, int length])
    Binary-safe file write */
-PHP_FUNCTION(fwrite)
+PHPAPI PHP_FUNCTION(fwrite)
 {
 	zval **arg1, **arg2, **arg3=NULL;
 	int ret, type;
@@ -1136,7 +1136,7 @@ PHP_FUNCTION(fwrite)
 
 /* {{{ proto bool fflush(resource fp)
    Flushes output */
-PHP_FUNCTION(fflush)
+PHPAPI PHP_FUNCTION(fflush)
 {
 	zval **arg1;
 	int ret, type;
@@ -1200,7 +1200,7 @@ PHP_FUNCTION(set_file_buffer)
 
 /* {{{ proto bool rewind(resource fp)
    Rewind the position of a file pointer */
-PHP_FUNCTION(rewind)
+PHPAPI PHP_FUNCTION(rewind)
 {
 	zval **arg1;
 	void *what;
@@ -1222,7 +1222,7 @@ PHP_FUNCTION(rewind)
 
 /* {{{ proto int ftell(resource fp)
    Get file pointer's read/write position */
-PHP_FUNCTION(ftell)
+PHPAPI PHP_FUNCTION(ftell)
 {
 	zval **arg1;
 	void *what;
@@ -1246,7 +1246,7 @@ PHP_FUNCTION(ftell)
 
 /* {{{ proto int fseek(resource fp, int offset [, int whence])
    Seek on a file pointer */
-PHP_FUNCTION(fseek)
+PHPAPI PHP_FUNCTION(fseek)
 {
 	zval **arg1, **arg2, **arg3;
 	int argcount = ZEND_NUM_ARGS(), whence = SEEK_SET;
@@ -1404,7 +1404,7 @@ PHP_FUNCTION(umask)
 /* {{{ proto int fpassthru(resource fp)
    Output all remaining data from a file pointer */
 
-PHP_FUNCTION(fpassthru)
+PHPAPI PHP_FUNCTION(fpassthru)
 {
 	zval **arg1;
 	int size, type;
@@ -1671,7 +1671,7 @@ PHPAPI int php_copy_file(char *src, char *dest TSRMLS_DC)
 
 /* {{{ proto string fread(resource fp, int length)
    Binary-safe file read */
-PHP_FUNCTION(fread)
+PHPAPI PHP_FUNCTION(fread)
 {
 	zval **arg1, **arg2;
 	int len, type;
diff --git a/ext/standard/file.h b/ext/standard/file.h
index 4770f888b8..6d08e31ad9 100644
--- a/ext/standard/file.h
+++ b/ext/standard/file.h
@@ -29,24 +29,24 @@ PHP_MSHUTDOWN_FUNCTION(file);
 PHP_FUNCTION(tempnam);
 PHP_NAMED_FUNCTION(php_if_tmpfile);
 PHP_NAMED_FUNCTION(php_if_fopen);
-PHP_FUNCTION(fclose);
+PHPAPI PHP_FUNCTION(fclose);
 PHP_FUNCTION(popen);
 PHP_FUNCTION(pclose);
-PHP_FUNCTION(feof);
-PHP_FUNCTION(fread);
-PHP_FUNCTION(fgetc);
-PHP_FUNCTION(fgets);
+PHPAPI PHP_FUNCTION(feof);
+PHPAPI PHP_FUNCTION(fread);
+PHPAPI PHP_FUNCTION(fgetc);
+PHPAPI PHP_FUNCTION(fgets);
 PHP_FUNCTION(fscanf);
-PHP_FUNCTION(fgetss);
+PHPAPI PHP_FUNCTION(fgetss);
 PHP_FUNCTION(fgetcsv);
-PHP_FUNCTION(fwrite);
-PHP_FUNCTION(fflush);
-PHP_FUNCTION(rewind);
-PHP_FUNCTION(ftell);
-PHP_FUNCTION(fseek);
+PHPAPI PHP_FUNCTION(fwrite);
+PHPAPI PHP_FUNCTION(fflush);
+PHPAPI PHP_FUNCTION(rewind);
+PHPAPI PHP_FUNCTION(ftell);
+PHPAPI PHP_FUNCTION(fseek);
 PHP_FUNCTION(mkdir);
 PHP_FUNCTION(rmdir);
-PHP_FUNCTION(fpassthru);
+PHPAPI PHP_FUNCTION(fpassthru);
 PHP_FUNCTION(readfile);
 PHP_FUNCTION(umask);
 PHP_FUNCTION(rename);
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index 24565602ea..624e3182a9 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -86,27 +86,27 @@ static int gz_magic[2] = {0x1f, 0x8b};	/* gzip magic header */
 /* {{{ php_zlib_functions[]
  */
 function_entry php_zlib_functions[] = {
-	PHP_FE(readgzfile,								NULL)
-	PHP_NAMED_FE(gzrewind,	PHP_FN(rewind),			NULL)
-	PHP_NAMED_FE(gzclose,	PHP_FN(fclose),			NULL)
-	PHP_NAMED_FE(gzeof,		PHP_FN(feof),			NULL)
-	PHP_NAMED_FE(gzgetc,	PHP_FN(fgetc),			NULL)
-	PHP_NAMED_FE(gzgets,	PHP_FN(fgets),			NULL)
-	PHP_NAMED_FE(gzgetss,	PHP_FN(fgetss),			NULL)
-	PHP_NAMED_FE(gzread,	PHP_FN(fread),			NULL)
-	PHP_FE(gzopen,									NULL)
-	PHP_NAMED_FE(gzpassthru,	PHP_FN(fpassthru),	NULL)
-	PHP_NAMED_FE(gzseek,		PHP_FN(fseek),		NULL)
-	PHP_NAMED_FE(gztell,		PHP_FN(ftell),		NULL)
-	PHP_NAMED_FE(gzwrite,		PHP_FN(fwrite),		NULL)
-	PHP_NAMED_FE(gzputs,		PHP_FN(fwrite),		NULL)
-	PHP_FE(gzfile,									NULL)
-	PHP_FE(gzcompress,                  			NULL)
-	PHP_FE(gzuncompress,                			NULL)
-	PHP_FE(gzdeflate,                   			NULL)
-	PHP_FE(gzinflate,                   			NULL)
-	PHP_FE(gzencode,								NULL)
-	PHP_FE(ob_gzhandler,							NULL)
+	PHP_FE(readgzfile,						NULL)
+	PHP_FALIAS(gzrewind,	rewind,			NULL)
+	PHP_FALIAS(gzclose,		fclose,			NULL)
+	PHP_FALIAS(gzeof,		feof,			NULL)
+	PHP_FALIAS(gzgetc,		fgetc,			NULL)
+	PHP_FALIAS(gzgets,		fgets,			NULL)
+	PHP_FALIAS(gzgetss,		fgetss,			NULL)
+	PHP_FALIAS(gzread,		fread,			NULL)
+	PHP_FE(gzopen,							NULL)
+	PHP_FALIAS(gzpassthru,	fpassthru,		NULL)
+	PHP_FALIAS(gzseek,		fseek,			NULL)
+	PHP_FALIAS(gztell,		ftell,			NULL)
+	PHP_FALIAS(gzwrite,		fwrite,			NULL)
+	PHP_FALIAS(gzputs,		fwrite,			NULL)
+	PHP_FE(gzfile,							NULL)
+	PHP_FE(gzcompress,            			NULL)
+	PHP_FE(gzuncompress,           			NULL)
+	PHP_FE(gzdeflate,             			NULL)
+	PHP_FE(gzinflate,              			NULL)
+	PHP_FE(gzencode,						NULL)
+	PHP_FE(ob_gzhandler,					NULL)
 	{NULL, NULL, NULL}
 };
 /* }}} */
diff --git a/ext/zlib/zlib.dsp b/ext/zlib/zlib.dsp
index 2c200e5d5e..999953f306 100644
--- a/ext/zlib/zlib.dsp
+++ b/ext/zlib/zlib.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\..\TSRM" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL_ZLIB" /D ZTS=1 /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "..\..\..\php_build\zlib" /D ZEND_DEBUG=0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZLIB_EXPORTS" /D "COMPILE_DL_ZLIB" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_ZLIB=1 /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "..\..\..\php_build\includes" /D ZEND_DEBUG=0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZLIB_EXPORTS" /D "COMPILE_DL_ZLIB" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_ZLIB=1 /YX /FD /c

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD BASE RSC /l 0x406 /d "NDEBUG"

@@ -71,7 +71,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL_ZLIB" /D ZTS=1 /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /GX /O2 /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "..\..\..\php_build\zlib" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZLIB_EXPORTS" /D "COMPILE_DL_ZLIB" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_ZLIB=1 /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /GX /O2 /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "..\..\..\php_build\includes" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZLIB_EXPORTS" /D "COMPILE_DL_ZLIB" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_ZLIB=1 /FR /YX /FD /c

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD BASE RSC /l 0x406 /d "NDEBUG"