mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-27 14:13:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
out even if it doesn't work.
This commit is contained in:
Andi Gutmans 1999-10-16 10:14:47 +00:00
parent e74d81f2ed
commit ad84f02efb
6 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/standard/basic_functions.c
View File

@ -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:

1
ext/standard/basic_functions.h
View File

@ -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);

4
main/mergesort.c
View File

@ -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 (*)());

4
php4dllts.dsp
View File

@ -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

4
php4ts.dsp
View File

@ -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"

2
sapi/cgi/cgi_main.c
View File

@ -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) {