- Get windows version to compile again. No biggy if array_map is not #if 0'd

  out even if it doesn't work.

6 files changed, 13 insertions, 4 deletions

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 34033711d4..8c400933ff 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -3143,7 +3143,6 @@ PHP_FUNCTION(array_reverse)
 /* }}} */
 
 
-#if 0
 /* {{{ proto array array_map(array input, string value_exp [, string key_exp] */
 PHP_FUNCTION(array_map)
 {
@@ -3176,7 +3175,6 @@ PHP_FUNCTION(array_map)
 		zend_hash_move_forward((*input)->value.ht);
 	}		
 }
-#endif
 
 /*
  * Local variables:
diff --git a/ext/standard/basic_functions.h b/ext/standard/basic_functions.h
index 3b266a99e0..a01b35aa90 100644
--- a/ext/standard/basic_functions.h
+++ b/ext/standard/basic_functions.h
@@ -60,6 +60,7 @@ PHP_FUNCTION(usort);
 PHP_FUNCTION(uasort);
 PHP_FUNCTION(uksort);
 PHP_FUNCTION(array_walk);
+PHP_FUNCTION(array_map);
 PHP_FUNCTION(count);
 PHP_FUNCTION(flush);
 PHP_FUNCTION(end);
diff --git a/main/mergesort.c b/main/mergesort.c
index e7db8ec98f..0cb1029126 100644
--- a/main/mergesort.c
+++ b/main/mergesort.c
@@ -58,6 +58,10 @@ static char sccsid[] = "@(#)merge.c	8.2 (Berkeley) 2/14/94";
 #include <stdlib.h>
 #include <string.h>
 
+#if (WINNT|WIN32)
+#include <winsock.h> /* Includes definition for u_char */
+#endif
+
 static void setup (u_char *, u_char *, size_t, size_t, int (*)());
 static void insertionsort (u_char *, size_t, size_t, int (*)());
 
diff --git a/php4dllts.dsp b/php4dllts.dsp
index 012f358640..f3fba74bd5 100644
--- a/php4dllts.dsp
+++ b/php4dllts.dsp
@@ -123,6 +123,10 @@ SOURCE=.\main.c
 # End Source File

 # Begin Source File

 

+SOURCE=.\mergesort.c

+# End Source File

+# Begin Source File

+

 SOURCE=.\output.c

 # End Source File

 # Begin Source File

diff --git a/php4ts.dsp b/php4ts.dsp
index 267922c801..4634e85c23 100644
--- a/php4ts.dsp
+++ b/php4ts.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # 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 /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

+# 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

 # SUBTRACT CPP /YX /Yc /Yu

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

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -67,7 +67,7 @@ LINK32=link.exe
 # 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 /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

+# 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

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /i "c:\include" /d "_DEBUG"

diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 4a165b80c5..2346cfab8d 100644
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -453,6 +453,7 @@ any .htaccess restrictions anywhere on your site you can leave doc_root undefine
 		php_module_shutdown();
 		return FAILURE;
 	} else if (file_handle.handle.fp && file_handle.handle.fp!=stdin) {
+#if !(WIN32|WINNT)
 		/* #!php support */
 		c = fgetc(file_handle.handle.fp);
 		if (c == '#') {
@@ -463,6 +464,7 @@ any .htaccess restrictions anywhere on your site you can leave doc_root undefine
 		} else {
 			rewind(file_handle.handle.fp);
 		}
+#endif
 	}
 
 	switch (behavior) {