cvs: php4 /ext/bz2 bz2.c bz2.dsp php_bz2.h /ext/standard file.c file.h /ext/zlib zlib.c zlib.dsp
| From: | Zeev Suraski | Date: | Fri, 05 Apr 2002 11:51:42 +0000 |
| Subject: | cvs: php4 /ext/bz2 bz2.c bz2.dsp php_bz2.h /ext/standard file.c file.h /ext/zlib zlib.c zlib.dsp | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-10896@lists.php.net to get a copy of this message | ||
zeev Fri Apr 5 06:51:42 2002 EDT
Modified files:
/php4/ext/bz2 bz2.c bz2.dsp php_bz2.h
/php4/ext/standard file.c file.h
/php4/ext/zlib zlib.c zlib.dsp
Log:
Fix gzip/bz2 builds for Windows
Index: php4/ext/bz2/bz2.c diff -u php4/ext/bz2/bz2.c:1.45 php4/ext/bz2/bz2.c:1.46 --- php4/ext/bz2/bz2.c:1.45 Thu Apr 4 10:24:37 2002 +++ php4/ext/bz2/bz2.c Fri Apr 5 06:51:33 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: bz2.c,v 1.45 2002/04/04 15:24:37 wez Exp $ */ +/* $Id: bz2.c,v 1.46 2002/04/05 11:51:33 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -46,9 +46,9 @@ function_entry bz2_functions[] = { PHP_FE(bzopen, NULL) PHP_FE(bzread, NULL) - PHP_NAMED_FE(bzwrite, PHP_FN(fwrite), NULL) - PHP_NAMED_FE(bzflush, PHP_FN(fflush), NULL) - PHP_NAMED_FE(bzclose, PHP_FN(fclose), NULL) + PHP_FALIAS(bzwrite, fwrite, NULL) + PHP_FALIAS(bzflush, fflush, NULL) + PHP_FALIAS(bzclose, fclose, NULL) PHP_FE(bzerrno, NULL) PHP_FE(bzerrstr, NULL) PHP_FE(bzerror, NULL) @@ -137,7 +137,7 @@ }; /* {{{ Bzip2 stream openers */ -PHPAPI php_stream *_php_stream_bz2open_from_BZFILE(BZFILE *bz, +PHP_BZ2_API php_stream *_php_stream_bz2open_from_BZFILE(BZFILE *bz, char *mode, php_stream *innerstream STREAMS_DC TSRMLS_DC) @@ -152,7 +152,7 @@ return php_stream_alloc_rel(&php_stream_bz2io_ops, self, 0, mode); } -PHPAPI php_stream *_php_stream_bz2open(php_stream_wrapper *wrapper, +PHP_BZ2_API php_stream *_php_stream_bz2open(php_stream_wrapper *wrapper, char *path, char *mode, int options, @@ -223,16 +223,18 @@ PHP_MINIT_FUNCTION(bz2) { - if(PG(allow_url_fopen)) + if(PG(allow_url_fopen)) { php_register_url_stream_wrapper("bzip2", &php_stream_bzip2_wrapper TSRMLS_CC); + } return SUCCESS; } PHP_MSHUTDOWN_FUNCTION(bz2) { - if (PG(allow_url_fopen)) + if (PG(allow_url_fopen)) { php_unregister_url_stream_wrapper("bzip2" TSRMLS_CC); + } return SUCCESS; } Index: php4/ext/bz2/bz2.dsp diff -u php4/ext/bz2/bz2.dsp:1.2 php4/ext/bz2/bz2.dsp:1.3 --- php4/ext/bz2/bz2.dsp:1.2 Mon Mar 18 04:30:59 2002 +++ php4/ext/bz2/bz2.dsp Fri Apr 5 06:51:33 2002 @@ -44,7 +44,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BZ2_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\TSRM" /D ZEND_DEBUG=0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "PHP_EXPORTS" /D "COMPILE_DL_BZ2" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_BZ2=1 /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\TSRM" /I "..\..\..\php_build\includes" /D ZEND_DEBUG=0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_BZ2" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_BZ2=1 /D "PHP_BZ2_EXPORTS" /FR /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x407 /d "NDEBUG" @@ -54,7 +54,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 php4ts.lib libbz2.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_bz2.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline" +# ADD LINK32 libbz2.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_bz2.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline" /libpath:"..\..\..\php_build\release" !ELSEIF "$(CFG)" == "bz2 - Win32 Debug_TS" @@ -70,7 +70,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BZ2_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\TSRM" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "PHP_EXPORTS" /D "COMPILE_DL_BZ2" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_BZ2=1 /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\TSRM" /I "..\..\..\php_build\includes" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_BZ2" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_BZ2=1 /D "PHP_BZ2_EXPORTS" /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x407 /d "_DEBUG" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 php4ts_debug.lib libbz2.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_bz2.dll" /pdbtype:sept /libpath:"..\..\Debug_TS" +# ADD LINK32 php4ts_debug.lib libbz2.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_bz2.dll" /pdbtype:sept /libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\release" !ENDIF Index: php4/ext/bz2/php_bz2.h diff -u php4/ext/bz2/php_bz2.h:1.10 php4/ext/bz2/php_bz2.h:1.11 --- php4/ext/bz2/php_bz2.h:1.10 Thu Apr 4 10:24:38 2002 +++ php4/ext/bz2/php_bz2.h Fri Apr 5 06:51:33 2002 @@ -48,8 +48,14 @@ #define phpext_bz2_ptr NULL #endif -PHPAPI php_stream *_php_stream_bz2open(php_stream_wrapper *wrapper, char *path, char *mode, int options, char **opened_path STREAMS_DC TSRMLS_DC); -PHPAPI php_stream *_php_stream_bz2open_from_BZFILE(BZFILE *bz, char *mode, php_stream *innerstream STREAMS_DC TSRMLS_DC); +#ifdef PHP_BZ2_EXPORTS +#define PHP_BZ2_API __declspec(dllexport) +#else +#define PHP_BZ2_API __declspec(dllimport) +#endif + +PHP_BZ2_API php_stream *_php_stream_bz2open(php_stream_wrapper *wrapper, char *path, char *mode, int options, char **opened_path STREAMS_DC TSRMLS_DC); +PHP_BZ2_API php_stream *_php_stream_bz2open_from_BZFILE(BZFILE *bz, char *mode, php_stream *innerstream STREAMS_DC TSRMLS_DC); #define php_stream_bz2open_from_BZFILE(bz, mode, innerstream) _php_stream_bz2open_from_BZFILE((bz), (mode), (innerstream) STREAMS_CC TSRMLS_CC) #define php_stream_bz2open(wrapper, path, mode, options, opened_path) _php_stream_bz2open((wrapper), (path), (mode), (options), (opened_path) STREAMS_CC TSRMLS_CC) Index: php4/ext/standard/file.c diff -u php4/ext/standard/file.c:1.222 php4/ext/standard/file.c:1.223 --- php4/ext/standard/file.c:1.222 Wed Mar 27 19:48:59 2002 +++ php4/ext/standard/file.c Fri Apr 5 06:51:34 2002 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.222 2002/03/28 00:48:59 wez Exp $ */ +/* $Id: file.c,v 1.223 2002/04/05 11:51:34 zeev Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -604,7 +604,7 @@ /* {{{ 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 @@ /* {{{ 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 @@ /* {{{ 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 @@ /* {{{ 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 @@ /* {{{ 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 @@ /* {{{ 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 @@ /* {{{ proto bool fflush(resource fp) Flushes output */ -PHP_FUNCTION(fflush) +PHPAPI PHP_FUNCTION(fflush) { zval **arg1; int ret, type; @@ -1200,7 +1200,7 @@ /* {{{ 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 @@ /* {{{ 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 @@ /* {{{ 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 @@ /* {{{ 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 @@ /* {{{ proto string fread(resource fp, int length) Binary-safe file read */ -PHP_FUNCTION(fread) +PHPAPI PHP_FUNCTION(fread) { zval **arg1, **arg2; int len, type; Index: php4/ext/standard/file.h diff -u php4/ext/standard/file.h:1.57 php4/ext/standard/file.h:1.58 --- php4/ext/standard/file.h:1.57 Thu Mar 21 14:18:13 2002 +++ php4/ext/standard/file.h Fri Apr 5 06:51:34 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.h,v 1.57 2002/03/21 19:18:13 hholzgra Exp $ */ +/* $Id: file.h,v 1.58 2002/04/05 11:51:34 zeev Exp $ */ /* Synced with php 3.0 revision 1.30 1999-06-16 [ssb] */ @@ -29,24 +29,24 @@ 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); Index: php4/ext/zlib/zlib.c diff -u php4/ext/zlib/zlib.c:1.121 php4/ext/zlib/zlib.c:1.122 --- php4/ext/zlib/zlib.c:1.121 Sun Mar 24 13:04:56 2002 +++ php4/ext/zlib/zlib.c Fri Apr 5 06:51:37 2002 @@ -18,7 +18,7 @@ | Jade Nicoletti <nicoletti@nns.ch> | +----------------------------------------------------------------------+ */ -/* $Id: zlib.c,v 1.121 2002/03/24 18:04:56 wez Exp $ */ +/* $Id: zlib.c,v 1.122 2002/04/05 11:51:37 zeev Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -86,27 +86,27 @@ /* {{{ 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} }; /* }}} */ Index: php4/ext/zlib/zlib.dsp diff -u php4/ext/zlib/zlib.dsp:1.13 php4/ext/zlib/zlib.dsp:1.14 --- php4/ext/zlib/zlib.dsp:1.13 Mon Mar 18 04:47:24 2002 +++ php4/ext/zlib/zlib.dsp Fri Apr 5 06:51:41 2002 @@ -44,7 +44,7 @@ # 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 @@ # 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"
Index: php4/ext/bz2/bz2.c diff -u php4/ext/bz2/bz2.c:1.45 php4/ext/bz2/bz2.c:1.46 --- php4/ext/bz2/bz2.c:1.45 Thu Apr 4 10:24:37 2002 +++ php4/ext/bz2/bz2.c Fri Apr 5 06:51:33 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: bz2.c,v 1.45 2002/04/04 15:24:37 wez Exp $ */ +/* $Id: bz2.c,v 1.46 2002/04/05 11:51:33 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -46,9 +46,9 @@ function_entry bz2_functions[] = { PHP_FE(bzopen, NULL) PHP_FE(bzread, NULL) - PHP_NAMED_FE(bzwrite, PHP_FN(fwrite), NULL) - PHP_NAMED_FE(bzflush, PHP_FN(fflush), NULL) - PHP_NAMED_FE(bzclose, PHP_FN(fclose), NULL) + PHP_FALIAS(bzwrite, fwrite, NULL) + PHP_FALIAS(bzflush, fflush, NULL) + PHP_FALIAS(bzclose, fclose, NULL) PHP_FE(bzerrno, NULL) PHP_FE(bzerrstr, NULL) PHP_FE(bzerror, NULL) @@ -137,7 +137,7 @@ }; /* {{{ Bzip2 stream openers */ -PHPAPI php_stream *_php_stream_bz2open_from_BZFILE(BZFILE *bz, +PHP_BZ2_API php_stream *_php_stream_bz2open_from_BZFILE(BZFILE *bz, char *mode, php_stream *innerstream STREAMS_DC TSRMLS_DC) @@ -152,7 +152,7 @@ return php_stream_alloc_rel(&php_stream_bz2io_ops, self, 0, mode); } -PHPAPI php_stream *_php_stream_bz2open(php_stream_wrapper *wrapper, +PHP_BZ2_API php_stream *_php_stream_bz2open(php_stream_wrapper *wrapper, char *path, char *mode, int options, @@ -223,16 +223,18 @@ PHP_MINIT_FUNCTION(bz2) { - if(PG(allow_url_fopen)) + if(PG(allow_url_fopen)) { php_register_url_stream_wrapper("bzip2", &php_stream_bzip2_wrapper TSRMLS_CC); + } return SUCCESS; } PHP_MSHUTDOWN_FUNCTION(bz2) { - if (PG(allow_url_fopen)) + if (PG(allow_url_fopen)) { php_unregister_url_stream_wrapper("bzip2" TSRMLS_CC); + } return SUCCESS; } Index: php4/ext/bz2/bz2.dsp diff -u php4/ext/bz2/bz2.dsp:1.2 php4/ext/bz2/bz2.dsp:1.3 --- php4/ext/bz2/bz2.dsp:1.2 Mon Mar 18 04:30:59 2002 +++ php4/ext/bz2/bz2.dsp Fri Apr 5 06:51:33 2002 @@ -44,7 +44,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BZ2_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\TSRM" /D ZEND_DEBUG=0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "PHP_EXPORTS" /D "COMPILE_DL_BZ2" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_BZ2=1 /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\TSRM" /I "..\..\..\php_build\includes" /D ZEND_DEBUG=0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_BZ2" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_BZ2=1 /D "PHP_BZ2_EXPORTS" /FR /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x407 /d "NDEBUG" @@ -54,7 +54,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 php4ts.lib libbz2.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_bz2.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline" +# ADD LINK32 libbz2.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_bz2.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline" /libpath:"..\..\..\php_build\release" !ELSEIF "$(CFG)" == "bz2 - Win32 Debug_TS" @@ -70,7 +70,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BZ2_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\TSRM" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "PHP_EXPORTS" /D "COMPILE_DL_BZ2" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_BZ2=1 /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\TSRM" /I "..\..\..\php_build\includes" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_BZ2" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_BZ2=1 /D "PHP_BZ2_EXPORTS" /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x407 /d "_DEBUG" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 php4ts_debug.lib libbz2.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_bz2.dll" /pdbtype:sept /libpath:"..\..\Debug_TS" +# ADD LINK32 php4ts_debug.lib libbz2.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_bz2.dll" /pdbtype:sept /libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\release" !ENDIF Index: php4/ext/bz2/php_bz2.h diff -u php4/ext/bz2/php_bz2.h:1.10 php4/ext/bz2/php_bz2.h:1.11 --- php4/ext/bz2/php_bz2.h:1.10 Thu Apr 4 10:24:38 2002 +++ php4/ext/bz2/php_bz2.h Fri Apr 5 06:51:33 2002 @@ -48,8 +48,14 @@ #define phpext_bz2_ptr NULL #endif -PHPAPI php_stream *_php_stream_bz2open(php_stream_wrapper *wrapper, char *path, char *mode, int options, char **opened_path STREAMS_DC TSRMLS_DC); -PHPAPI php_stream *_php_stream_bz2open_from_BZFILE(BZFILE *bz, char *mode, php_stream *innerstream STREAMS_DC TSRMLS_DC); +#ifdef PHP_BZ2_EXPORTS +#define PHP_BZ2_API __declspec(dllexport) +#else +#define PHP_BZ2_API __declspec(dllimport) +#endif + +PHP_BZ2_API php_stream *_php_stream_bz2open(php_stream_wrapper *wrapper, char *path, char *mode, int options, char **opened_path STREAMS_DC TSRMLS_DC); +PHP_BZ2_API php_stream *_php_stream_bz2open_from_BZFILE(BZFILE *bz, char *mode, php_stream *innerstream STREAMS_DC TSRMLS_DC); #define php_stream_bz2open_from_BZFILE(bz, mode, innerstream) _php_stream_bz2open_from_BZFILE((bz), (mode), (innerstream) STREAMS_CC TSRMLS_CC) #define php_stream_bz2open(wrapper, path, mode, options, opened_path) _php_stream_bz2open((wrapper), (path), (mode), (options), (opened_path) STREAMS_CC TSRMLS_CC) Index: php4/ext/standard/file.c diff -u php4/ext/standard/file.c:1.222 php4/ext/standard/file.c:1.223 --- php4/ext/standard/file.c:1.222 Wed Mar 27 19:48:59 2002 +++ php4/ext/standard/file.c Fri Apr 5 06:51:34 2002 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.222 2002/03/28 00:48:59 wez Exp $ */ +/* $Id: file.c,v 1.223 2002/04/05 11:51:34 zeev Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -604,7 +604,7 @@ /* {{{ 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 @@ /* {{{ 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 @@ /* {{{ 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 @@ /* {{{ 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 @@ /* {{{ 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 @@ /* {{{ 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 @@ /* {{{ proto bool fflush(resource fp) Flushes output */ -PHP_FUNCTION(fflush) +PHPAPI PHP_FUNCTION(fflush) { zval **arg1; int ret, type; @@ -1200,7 +1200,7 @@ /* {{{ 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 @@ /* {{{ 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 @@ /* {{{ 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 @@ /* {{{ 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 @@ /* {{{ proto string fread(resource fp, int length) Binary-safe file read */ -PHP_FUNCTION(fread) +PHPAPI PHP_FUNCTION(fread) { zval **arg1, **arg2; int len, type; Index: php4/ext/standard/file.h diff -u php4/ext/standard/file.h:1.57 php4/ext/standard/file.h:1.58 --- php4/ext/standard/file.h:1.57 Thu Mar 21 14:18:13 2002 +++ php4/ext/standard/file.h Fri Apr 5 06:51:34 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.h,v 1.57 2002/03/21 19:18:13 hholzgra Exp $ */ +/* $Id: file.h,v 1.58 2002/04/05 11:51:34 zeev Exp $ */ /* Synced with php 3.0 revision 1.30 1999-06-16 [ssb] */ @@ -29,24 +29,24 @@ 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); Index: php4/ext/zlib/zlib.c diff -u php4/ext/zlib/zlib.c:1.121 php4/ext/zlib/zlib.c:1.122 --- php4/ext/zlib/zlib.c:1.121 Sun Mar 24 13:04:56 2002 +++ php4/ext/zlib/zlib.c Fri Apr 5 06:51:37 2002 @@ -18,7 +18,7 @@ | Jade Nicoletti <nicoletti@nns.ch> | +----------------------------------------------------------------------+ */ -/* $Id: zlib.c,v 1.121 2002/03/24 18:04:56 wez Exp $ */ +/* $Id: zlib.c,v 1.122 2002/04/05 11:51:37 zeev Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -86,27 +86,27 @@ /* {{{ 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} }; /* }}} */ Index: php4/ext/zlib/zlib.dsp diff -u php4/ext/zlib/zlib.dsp:1.13 php4/ext/zlib/zlib.dsp:1.14 --- php4/ext/zlib/zlib.dsp:1.13 Mon Mar 18 04:47:24 2002 +++ php4/ext/zlib/zlib.dsp Fri Apr 5 06:51:41 2002 @@ -44,7 +44,7 @@ # 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 @@ # 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"