cvs: php4 / php.ini-dist php.ini-optimized /ext/shmop php_shmop.h shmop.c shmop.dsp /win32 php_modules.dsw

dbeu Tue Aug 7 09:33:28 2001 EDT Added files: /php4/ext/shmop shmop.dsp Modified files: /php4 php.ini-dist php.ini-optimized /php4/ext/shmop php_shmop.h shmop.c /php4/win32 php_modules.dsw Log: let ext\shmop build under win32 Index: php4/php.ini-dist diff -u php4/php.ini-dist:1.88 php4/php.ini-dist:1.89 --- php4/php.ini-dist:1.88 Fri Jul 13 14:21:21 2001 +++ php4/php.ini-dist Tue Aug 7 09:33:27 2001 @@ -1,5 +1,5 @@ [PHP] -; $Id: php.ini-dist,v 1.88 2001/07/13 18:21:21 jflemer Exp $ +; $Id: php.ini-dist,v 1.89 2001/08/07 13:33:27 dbeu Exp $ ;;;;;;;;;;;;;;;;;;; ; About this file ; @@ -439,7 +439,9 @@ ;extension=php_pgsql.dll ;extension=php_printer.dll ;extension=php_sablot.dll +;extension=php_shmop.dll ;extension=php_snmp.dll +;extension=php_sockets.dll ;extension=php_sybase_ct.dll ;extension=php_xslt.dll ;extension=php_yaz.dll Index: php4/php.ini-optimized diff -u php4/php.ini-optimized:1.42 php4/php.ini-optimized:1.43 --- php4/php.ini-optimized:1.42 Fri Jul 13 14:21:21 2001 +++ php4/php.ini-optimized Tue Aug 7 09:33:27 2001 @@ -316,7 +316,9 @@ ;extension=php_pgsql.dll ;extension=php_printer.dll ;extension=php_sablot.dll +;extension=php_shmop.dll ;extension=php_snmp.dll +;extension=php_sockets.dll ;extension=php_sybase_ct.dll ;extension=php_xslt.dll ;extension=php_yaz.dll Index: php4/ext/shmop/php_shmop.h diff -u php4/ext/shmop/php_shmop.h:1.5 php4/ext/shmop/php_shmop.h:1.6 --- php4/ext/shmop/php_shmop.h:1.5 Sat Jul 28 07:36:13 2001 +++ php4/ext/shmop/php_shmop.h Tue Aug 7 09:33:27 2001 @@ -43,6 +43,10 @@ PHP_FUNCTION(shmop_write); PHP_FUNCTION(shmop_delete); +#ifdef PHP_WIN32 +typedef int key_t; +#endif + struct php_shmop { int shmid; Index: php4/ext/shmop/shmop.c diff -u php4/ext/shmop/shmop.c:1.15 php4/ext/shmop/shmop.c:1.16 --- php4/ext/shmop/shmop.c:1.15 Tue Jul 31 01:44:04 2001 +++ php4/ext/shmop/shmop.c Tue Aug 7 09:33:27 2001 @@ -16,7 +16,7 @@ | Ilia Alshanetsky (iliaa@home.com) | +----------------------------------------------------------------------+ */ -/* $Id: shmop.c,v 1.15 2001/07/31 05:44:04 zeev Exp $ */ +/* $Id: shmop.c,v 1.16 2001/08/07 13:33:27 dbeu Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -25,8 +25,13 @@ #include "php.h" #include "php_ini.h" #include "php_shmop.h" -#include <sys/ipc.h> -#include <sys/shm.h> +# ifndef PHP_WIN32 +# include <sys/ipc.h> +# include <sys/shm.h> +#else +#include "tsrm_win32.h" +#endif + #if HAVE_SHMOP @@ -170,7 +175,7 @@ } shmop->size = shm.shm_segsz; - + rsid = zend_list_insert(shmop, shm_type); RETURN_LONG(rsid); } @@ -246,8 +251,6 @@ RETURN_FALSE; } zend_list_delete((*shmid)->value.lval); - - RETURN_LONG(0); } /* }}} */ Index: php4/win32/php_modules.dsw diff -u php4/win32/php_modules.dsw:1.44 php4/win32/php_modules.dsw:1.45 --- php4/win32/php_modules.dsw:1.44 Mon Jun 11 11:43:50 2001 +++ php4/win32/php_modules.dsw Tue Aug 7 09:33:27 2001 @@ -483,6 +483,18 @@ ############################################################################### +Project: "shmop"=..\ext\shmop\shmop.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + Project: "snmp"=..\ext\snmp\snmp.dsp - Package Owner=<4> Package=<5> Index: php4/ext/shmop/shmop.dsp +++ php4/ext/shmop/shmop.dsp # Microsoft Developer Studio Project File - Name="shmop" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 CFG=shmop - Win32 Debug_TS !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE !MESSAGE NMAKE /f "shmop.mak". !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE !MESSAGE NMAKE /f "shmop.mak" CFG="shmop - Win32 Debug_TS" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "shmop - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "shmop - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE # Begin Project # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe MTL=midl.exe RSC=rc.exe !IF "$(CFG)" == "shmop - Win32 Release_TS" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "Release_TS" # PROP BASE Intermediate_Dir "Release_TS" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "Release_TS" # PROP Intermediate_Dir "Release_TS" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SHMOP_EXPORTS" /YX /FD /c # ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\main" /I "..\..\TSRM" /I "..\..\ZEND" /D ZEND_WIN32=1 /D PHP_WIN32=1 /D "NDEBUG" /D "PHP_EXPORTS" /D "HAVE_SHMOP" /D COMPILE_DL_SHMOP=1 /D ZEND_DEBUG=0 /D "ZTS" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x407 /d "NDEBUG" # ADD RSC /l 0x407 /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # 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 /machine:I386 # ADD LINK32 php4ts.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 /machine:I386 /out:"..\..\Release_TS/php_shmop.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline" !ELSEIF "$(CFG)" == "shmop - Win32 Debug_TS" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "Debug_TS" # PROP BASE Intermediate_Dir "Debug_TS" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "Debug_TS" # PROP Intermediate_Dir "Debug_TS" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SHMOP_EXPORTS" /YX /FD /GZ /c # ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\\" /I "..\..\main" /I "..\..\TSRM" /I "..\..\ZEND" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP_EXPORTS" /D "COMPILE_DL_SHMOP" /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_SHMOP=1 /D ZTS=1 /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x407 /d "_DEBUG" # ADD RSC /l 0x407 /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # 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 php4ts_debug.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:"..\..\Debug_TS/php_shmop.dll" /pdbtype:sept /libpath:"..\..\Debug_TS" !ENDIF # Begin Target # Name "shmop - Win32 Release_TS" # Name "shmop - Win32 Debug_TS" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File SOURCE=.\shmop.c # End Source File # End Group # Begin Group "Header Files" # PROP Default_Filter "h;hpp;hxx;hm;inl" # Begin Source File SOURCE=.\php_shmop.h # End Source File # End Group # End Target # End Project