diff options
| author | Zeev Suraski <zeev@php.net> | 2002-04-05 11:51:43 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2002-04-05 11:51:43 +0000 |
| commit | 385b233040e2fb7d0f095aee561ff4e2e76dde11 (patch) | |
| tree | 9dca23c6d525d08ffdc517b5ffa2daf5b3c79595 /ext/zlib | |
| parent | 1abb9cd02c180bbf9550620daeb5f6dc05084cfd (diff) | |
| download | php-git-385b233040e2fb7d0f095aee561ff4e2e76dde11.tar.gz | |
Fix gzip/bz2 builds for Windows
Diffstat (limited to 'ext/zlib')
| -rw-r--r-- | ext/zlib/zlib.c | 42 | ||||
| -rw-r--r-- | ext/zlib/zlib.dsp | 4 |
2 files changed, 23 insertions, 23 deletions
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"
|