- Make CVS compile on Win32.

- Rename php3_COM.h -> php_COM.h

diff --git a/ext/com/php3_COM.h b/ext/com/php_COM.h
similarity index 75%
rename from ext/com/php3_COM.h
rename to ext/com/php_COM.h
index 60b7e06e97641619d6e0842a342d0527eb243d59..64d9c16548763f79cc8b5bbf66d740e1591b3f42 100644 (file)
--- a/ext/com/php3_COM.h
+++ b/ext/com/php_COM.h
@@ -1,5 +1,5 @@
-#ifndef _PHP3_COM_H
-#define _PHP3_COM_H
+#ifndef _PHP_COM_H
+#define _PHP_COM_H
 
 #if WIN32|WINNT
 
@@ -10,7 +10,7 @@ PHP_FUNCTION(COM_invoke);
 
 PHP_FUNCTION(com_propget);
 PHP_FUNCTION(com_propput);
-extern php3_module_entry COM_module_entry;
+extern zend_module_entry COM_module_entry;
 #define COM_module_ptr &COM_module_entry
 
 #else
@@ -21,4 +21,4 @@ extern php3_module_entry COM_module_entry;
 
 #define phpext_COM_ptr COM_module_ptr
 
-#endif  /* _PHP3_COM_H */
+#endif  /* _PHP_COM_H */

diff --git a/ext/rpc/com/php3_COM.h b/ext/rpc/com/php_com.h
similarity index 75%
rename from ext/rpc/com/php3_COM.h
rename to ext/rpc/com/php_com.h
index 60b7e06e97641619d6e0842a342d0527eb243d59..64d9c16548763f79cc8b5bbf66d740e1591b3f42 100644 (file)
--- a/ext/rpc/com/php3_COM.h
+++ b/ext/rpc/com/php_com.h
@@ -1,5 +1,5 @@
-#ifndef _PHP3_COM_H
-#define _PHP3_COM_H
+#ifndef _PHP_COM_H
+#define _PHP_COM_H
 
 #if WIN32|WINNT
 
@@ -10,7 +10,7 @@ PHP_FUNCTION(COM_invoke);
 
 PHP_FUNCTION(com_propget);
 PHP_FUNCTION(com_propput);
-extern php3_module_entry COM_module_entry;
+extern zend_module_entry COM_module_entry;
 #define COM_module_ptr &COM_module_entry
 
 #else
@@ -21,4 +21,4 @@ extern php3_module_entry COM_module_entry;
 
 #define phpext_COM_ptr COM_module_ptr
 
-#endif  /* _PHP3_COM_H */
+#endif  /* _PHP_COM_H */

diff --git a/ext/standard/dir.c b/ext/standard/dir.c
index 3345d255c6ae350ba9cd4de3f2005034ea889863..1a1b6d1bdc24826375a703c88f30282dd681ca81 100644 (file)
--- a/ext/standard/dir.c
+++ b/ext/standard/dir.c
@@ -243,7 +243,7 @@ PHP_FUNCTION(chdir)
 PHP_FUNCTION(getcwd)
 {
        char path[MAXPATHLEN];
-       char *ret;
+       char *ret=NULL;
        
        if (ARG_COUNT(ht) != 0) {
                WRONG_PARAM_COUNT;
@@ -253,8 +253,11 @@ PHP_FUNCTION(getcwd)
        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) {

diff --git a/main/config.w32.h b/main/config.w32.h
index 3b3c396b7359c80487dc0582fb10c6cc9c350380..41690c4488b4fde2c966515dc0642a413a8cddac 100644 (file)
--- a/main/config.w32.h
+++ b/main/config.w32.h
@@ -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

diff --git a/php4ts.dsp b/php4ts.dsp
index 4634e85c23abaa9004feaa2a21ff1f51a21444f8..267922c8010ce7eca9bac4d5072b3f21ee717622 100644 (file)
--- a/php4ts.dsp
+++ b/php4ts.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c\r
-# 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\r
+# 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\r
 # SUBTRACT CPP /YX /Yc /Yu\r
 # ADD BASE RSC /l 0x409 /d "NDEBUG"\r
 # ADD RSC /l 0x409 /d "NDEBUG"\r
@@ -67,7 +67,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c\r
-# 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\r
+# 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\r
 # SUBTRACT CPP /YX\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r
 # ADD RSC /l 0x409 /i "c:\include" /d "_DEBUG"\r