cvs: /php4/ext/com php_COM.h /php4/ext/com php3_COM.h /php4 config.w32.h php4ts.dsp /php4/ext/standard dir.c

andi Wed Oct 20 14:10:17 1999 EDT Added files: /php4/ext/com php_COM.h Removed files: /php4/ext/com php3_COM.h Modified files: /php4 config.w32.h php4ts.dsp /php4/ext/standard dir.c Log: - Make CVS compile on Win32. - Rename php3_COM.h -> php_COM.h Index: php4/config.w32.h diff -u php4/config.w32.h:1.15 php4/config.w32.h:1.16 --- php4/config.w32.h:1.15 Fri Oct 15 08:28:19 1999 +++ php4/config.w32.h Wed Oct 20 14:09:43 1999 @@ -85,6 +85,9 @@ /* Define if you have the usleep function. */ #undef HAVE_USLEEP + +#define HAVE_GETCWD 1 + #define NEED_ISBLANK 1 /* ---------------------------------------------------------------- The following may be changed and played with right now, but Index: php4/php4ts.dsp diff -u php4/php4ts.dsp:1.13 php4/php4ts.dsp:1.14 --- php4/php4ts.dsp:1.13 Sat Oct 16 06:14:46 1999 +++ php4/php4ts.dsp Wed Oct 20 14:09:43 1999 @@ -42,7 +42,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /Od /I "." /I "regex" /I "..\bindlib_w32" /I "libzend" /I "tsrm" /D "NDEBUG" /D "MSVC5" /D "_CONSOLE" /D "ZTS" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /Fr /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "regex" /I "..\bindlib_w32" /I "libzend" /I "tsrm" /D "NDEBUG" /D "MSVC5" /D "_CONSOLE" /D "ZTS" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /Fr /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" @@ -67,7 +67,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "." /I "regex" /I "..\bindlib_w32" /I "libzend" /I "tsrm" /D "DEBUG" /D "_DEBUG" /D "MSVC5" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "ZTS" /D ZEND_DEBUG=1 /FR /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "regex" /I "..\bindlib_w32" /I "libzend" /I "tsrm" /D "DEBUG" /D "_DEBUG" /D "MSVC5" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "ZTS" /D ZEND_DEBUG=1 /FR /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /i "c:\include" /d "_DEBUG" Index: php4/ext/standard/dir.c diff -u php4/ext/standard/dir.c:1.15 php4/ext/standard/dir.c:1.16 --- php4/ext/standard/dir.c:1.15 Wed Oct 20 12:17:30 1999 +++ php4/ext/standard/dir.c Wed Oct 20 14:09:44 1999 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dir.c,v 1.15 1999/10/20 16:17:30 thies Exp $ */ +/* $Id: dir.c,v 1.16 1999/10/20 18:09:44 andi Exp $ */ /* {{{ includes/startup/misc */ @@ -243,7 +243,7 @@ PHP_FUNCTION(getcwd) { char path[MAXPATHLEN]; - char *ret; + char *ret=NULL; if (ARG_COUNT(ht) != 0) { WRONG_PARAM_COUNT; @@ -253,8 +253,11 @@ ret = getcwd(path,MAXPATHLEN-1); #elif HAVE_GETWD ret = getwd(path); -#elif -#warning no proper getcwd support for your site +/* + * #warning is not ANSI C + * #else + * #warning no proper getcwd support for your site + */ #endif if (ret) {