CVS update: php3

Date: Thursday February 18, 1999 @ 12:48 Author: shane Update of /repository/php3 In directory asf:/u/temp/cvs-serv1222 Modified Files: compat.c compat.h config.w32.h dbm.dsp oci73.dsp php3.dsp php3.opt Log Message: fixup to get all compiling under win32 Index: php3/compat.c diff -c php3/compat.c:1.3 php3/compat.c:1.4 *** php3/compat.c:1.3 Wed Feb 10 01:24:10 1999 --- php3/compat.c Thu Feb 18 12:48:49 1999 *************** *** 26,32 **** | Authors: Sascha Schumann <sas@schell.de> | +----------------------------------------------------------------------+ ! $Id: compat.c,v 1.3 1999/02/10 06:24:10 fmk Exp $ */ --- 26,32 ---- | Authors: Sascha Schumann <sas@schell.de> | +----------------------------------------------------------------------+ ! $Id: compat.c,v 1.4 1999/02/18 17:48:49 shane Exp $ */ *************** *** 44,50 **** #endif #if !HAVE_FLOCK ! int flock(int fd, int operation) #if HAVE_STRUCT_FLOCK { struct flock flck; --- 44,50 ---- #endif #if !HAVE_FLOCK ! PHPAPI int flock(int fd, int operation) #if HAVE_STRUCT_FLOCK { struct flock flck; Index: php3/compat.h diff -c php3/compat.h:1.3 php3/compat.h:1.4 *** php3/compat.h:1.3 Thu Feb 4 13:32:43 1999 --- php3/compat.h Thu Feb 18 12:48:50 1999 *************** *** 10,16 **** #define LOCK_NB 4 #define LOCK_UN 8 ! extern int flock(int fd, int operation); #endif --- 10,16 ---- #define LOCK_NB 4 #define LOCK_UN 8 ! extern PHPAPI int flock(int fd, int operation); #endif Index: php3/config.w32.h diff -c php3/config.w32.h:1.75 php3/config.w32.h:1.76 *** php3/config.w32.h:1.75 Tue Feb 9 09:02:47 1999 --- php3/config.w32.h Thu Feb 18 12:48:50 1999 *************** *** 254,260 **** /* #undef HAVE_SYS_DIR_H */ /* Define if you have the <sys/file.h> header file. */ ! #define HAVE_SYS_FILE_H 1 /* Define if you have the <sys/ndir.h> header file. */ /* #undef HAVE_SYS_NDIR_H */ --- 254,260 ---- /* #undef HAVE_SYS_DIR_H */ /* Define if you have the <sys/file.h> header file. */ ! #define HAVE_SYS_FILE_H 0 /* Define if you have the <sys/ndir.h> header file. */ /* #undef HAVE_SYS_NDIR_H */ Index: php3/dbm.dsp diff -c php3/dbm.dsp:1.15 php3/dbm.dsp:1.16 *** php3/dbm.dsp:1.15 Thu Nov 12 08:48:53 1998 --- php3/dbm.dsp Thu Feb 18 12:48:50 1999 *************** *** 79,85 **** # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept ! # ADD LINK32 php.lib libdb.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:2 /subsystem:windows /dll /debug /machine:I386 /out:"c:\php3/php3_dbm.dll" /pdbtype:sept /libpath:"..\..\lib" /libpath:"cgi_debug" !ENDIF --- 79,85 ---- # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept ! # ADD LINK32 php.lib libdb.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:2 /subsystem:windows /dll /debug /machine:I386 /out:"c:\php3/php3_dbm.dll" /pdbtype:sept /libpath:"..\..\lib" /libpath:"c:\php3" !ENDIF *************** *** 90,103 **** # Begin Source File SOURCE=.\functions\db.c - # End Source File - # Begin Source File - - SOURCE=.\win32\flock.c - # End Source File - # Begin Source File - - SOURCE=.\win32\flock.h # End Source File # End Target # End Project --- 90,95 ---- Index: php3/oci73.dsp diff -c php3/oci73.dsp:1.3 php3/oci73.dsp:1.4 *** php3/oci73.dsp:1.3 Wed Jan 6 13:26:05 1999 --- php3/oci73.dsp Thu Feb 18 12:48:50 1999 *************** *** 79,85 **** # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept ! # ADD LINK32 ociw32.lib php.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"c:\php3/php3_oci73.dll" /pdbtype:sept /libpath:"..\..\lib\oci73" /libpath:"cgi_debug" !ENDIF --- 79,85 ---- # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept ! # ADD LINK32 ociw32.lib php.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"c:\php3/php3_oci73.dll" /pdbtype:sept /libpath:"..\..\lib\oci73" /libpath:"c:\php3" !ENDIF Index: php3/php3.dsp diff -c php3/php3.dsp:1.51 php3/php3.dsp:1.52 *** php3/php3.dsp:1.51 Fri Jan 29 19:52:20 1999 --- php3/php3.dsp Thu Feb 18 12:48:50 1999 *************** *** 456,461 **** --- 456,469 ---- # End Source File # Begin Source File + SOURCE=.\compat.c + # End Source File + # Begin Source File + + SOURCE=.\compat.h + # End Source File + # Begin Source File + SOURCE=.\config.w32.h # End Source File # Begin Source File Index: php3/php3.opt -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net