[PHP4BETA] CVS update: php4

Date: Wednesday April 21, 1999 @ 15:01 Author: zeev Update of /repository/php4 In directory php:/tmp/cvs-serv2832 Modified Files: Makefile.in config.w32.h php.h php4.dsp Removed Files: php_compat.c php_compat.h Log Message: * Rename php_compat.[ch] to flock_compat.[ch] and move it to ext/standard * Fix Win32 compilation Index: php4/Makefile.in diff -c php4/Makefile.in:1.10 php4/Makefile.in:1.11 *** php4/Makefile.in:1.10 Wed Apr 21 13:11:00 1999 --- php4/Makefile.in Wed Apr 21 15:01:35 1999 *************** *** 24,30 **** # +----------------------------------------------------------------------+ # ! # $Id: Makefile.in,v 1.10 1999/04/21 17:11:00 sas Exp $ # prefix = @prefix@ --- 24,30 ---- # +----------------------------------------------------------------------+ # ! # $Id: Makefile.in,v 1.11 1999/04/21 19:01:35 zeev Exp $ # prefix = @prefix@ *************** *** 62,72 **** SOURCE = main.c internal_functions.c snprintf.c php3_sprintf.c \ configuration-parser.c configuration-scanner.c request_info.c \ safe_mode.c fopen-wrappers.c php3_realpath.c alloca.c output.c \ ! php_ini.c php_compat.c OBJS = main.o internal_functions.o snprintf.o php3_sprintf.o \ configuration-parser.o configuration-scanner.o request_info.o \ safe_mode.o fopen-wrappers.o php3_realpath.o alloca.o output.o \ ! php_ini.o php_compat.o FUNCTIONS_SOURCE = functions/apache.c functions/fhttpd.c \ functions/crypt.c functions/db.c functions/dl.c functions/filepro.c \ --- 62,72 ---- SOURCE = main.c internal_functions.c snprintf.c php3_sprintf.c \ configuration-parser.c configuration-scanner.c request_info.c \ safe_mode.c fopen-wrappers.c php3_realpath.c alloca.c output.c \ ! php_ini.c OBJS = main.o internal_functions.o snprintf.o php3_sprintf.o \ configuration-parser.o configuration-scanner.o request_info.o \ safe_mode.o fopen-wrappers.o php3_realpath.o alloca.o output.o \ ! php_ini.o FUNCTIONS_SOURCE = functions/apache.c functions/fhttpd.c \ functions/crypt.c functions/db.c functions/dl.c functions/filepro.c \ Index: php4/config.w32.h diff -c php4/config.w32.h:1.1.1.1 php4/config.w32.h:1.2 *** php4/config.w32.h:1.1.1.1 Wed Apr 7 17:01:51 1999 --- php4/config.w32.h Wed Apr 21 15:01:36 1999 *************** *** 108,114 **** #define HAVE_TZSET 1 /* Define if you have the flock function. */ ! #define HAVE_FLOCK 1 /* Define if using alloca.c. */ /* #undef C_ALLOCA */ --- 108,114 ---- #define HAVE_TZSET 1 /* Define if you have the flock function. */ ! #define HAVE_FLOCK 0 /* Define if using alloca.c. */ /* #undef C_ALLOCA */ Index: php4/php.h diff -c php4/php.h:1.6 php4/php.h:1.7 *** php4/php.h:1.6 Wed Apr 21 13:11:00 1999 --- php4/php.h Wed Apr 21 15:01:36 1999 *************** *** 28,34 **** +----------------------------------------------------------------------+ */ ! /* $Id: php.h,v 1.6 1999/04/21 17:11:00 sas Exp $ */ #ifndef _PHP_H #define _PHP_H --- 28,34 ---- +----------------------------------------------------------------------+ */ ! /* $Id: php.h,v 1.7 1999/04/21 19:01:36 zeev Exp $ */ #ifndef _PHP_H #define _PHP_H *************** *** 509,516 **** #else #define XtOffsetOf(s_type,field) XtOffset(s_type*,field) #endif - - #include "php_compat.h" #endif --- 509,514 ---- Index: php4/php4.dsp diff -c php4/php4.dsp:1.7 php4/php4.dsp:1.8 *** php4/php4.dsp:1.7 Wed Apr 21 11:34:31 1999 --- php4/php4.dsp Wed Apr 21 15:01:36 1999 *************** *** 281,286 **** --- 281,290 ---- # End Source File # Begin Source File + SOURCE=.\ext\standard\flock_compat.c + # End Source File + # Begin Source File + SOURCE=.\ext\standard\formatted_print.c # End Source File # Begin Source File *************** *** 418,423 **** --- 422,431 ---- # Begin Source File SOURCE=.\ext\standard\file.h + # End Source File + # Begin Source File + + SOURCE=.\ext\standard\flock_compat.h # End Source File # Begin Source File -- PHP 4 Beta