cvs: pear / pear.dsw /PEAR pear.c pear.dsp php_pear.h

From: Date: Mon, 30 Apr 2001 16:26:58 +0000
Subject: cvs: pear / pear.dsw /PEAR pear.c pear.dsp php_pear.h
Groups: php.pear.cvs 
Request: Send a blank email to pear-cvs+get-103@lists.php.net to get a copy of this message
dbeu Mon Apr 30 09:26:58 2001 EDT Added files: /pear pear.dsw /pear/PEAR pear.dsp Modified files: /pear/PEAR pear.c php_pear.h Log: make pear build under win32

Index: pear/PEAR/pear.c diff -u pear/PEAR/pear.c:1.5 pear/PEAR/pear.c:1.6 --- pear/PEAR/pear.c:1.5 Sat Mar 17 16:34:30 2001 +++ pear/PEAR/pear.c Mon Apr 30 09:26:57 2001 @@ -20,8 +20,10 @@ #include "php.h" #include "php_ini.h" #include "php_pear.h" +#ifndef PHP_WIN32 #include "config.h" #include "build-defs.h" +#endif #include "ext/standard/info.h" /* {{{ structs and globals */ @@ -96,6 +98,10 @@ zval *tmp; /* REGISTER_INI_ENTRIES();*/ +#if ZTS + ZEND_INIT_MODULE_GLOBALS(pear, NULL, NULL); +#endif + pear.name = strdup("pear"); pear.name_length = 4; pear.builtin_functions = php_class_functions_pear; @@ -129,7 +135,7 @@ LONG_CONSTANT("PEAR_ERROR_TRIGGER", PEAR_ERROR_TRIGGER); LONG_CONSTANT("PEAR_ERROR_DIE", PEAR_ERROR_DIE); LONG_CONSTANT("PEAR_ERROR_CALLBACK", PEAR_ERROR_CALLBACK); - STRING_CONSTANT("PEAR_EXTENSION_DIR", PHP_EXTENSION_DIR); + STRING_CONSTANT("PEAR_EXTENSION_DIR", SAFE_STRING(PHP_EXTENSION_DIR)); return SUCCESS; } @@ -190,6 +196,7 @@ /* Remove if there's nothing to do at request start */ PHP_RINIT_FUNCTION(pear) { + PEARLS_FETCH(); zend_llist_init(&PEARG(destructor_objects), sizeof(zval), _destructor_objects_dtor, 0); return SUCCESS; } @@ -200,6 +207,7 @@ /* Remove if there's nothing to do at request end */ PHP_RSHUTDOWN_FUNCTION(pear) { + PEARLS_FETCH(); zend_llist_apply(&PEARG(destructor_objects), _call_destructors); zend_llist_destroy(&PEARG(destructor_objects)); @@ -213,7 +221,7 @@ PHP_MINFO_FUNCTION(pear) { php_info_print_table_start(); - php_info_print_table_header(2, "PEAR", " $Revision: 1.5 $"); + php_info_print_table_header(2, "PEAR", " $Revision: 1.6 $"); php_info_print_table_end(); /* DISPLAY_INI_ENTRIES(); */ @@ -631,7 +639,7 @@ } if (Z_LVAL_PP(mode) & PEAR_ERROR_TRIGGER) { int x = 0, len = Z_STRLEN_PP(message); - char *tmpstr = emalloc(len * 2) + 1; + char *tmpstr = (char*)emalloc(len * 2) + 1; char *p = Z_STRVAL_PP(message); char *q = tmpstr, *end = p + len; p = Z_STRVAL_PP(message); Index: pear/PEAR/php_pear.h diff -u pear/PEAR/php_pear.h:1.3 pear/PEAR/php_pear.h:1.4 --- pear/PEAR/php_pear.h:1.3 Thu Mar 15 20:57:02 2001 +++ pear/PEAR/php_pear.h Mon Apr 30 09:26:57 2001 @@ -38,6 +38,8 @@ #define LONG_CONSTANT(n,v) \ REGISTER_LONG_CONSTANT((n),(v),CONST_CS|CONST_PERSISTENT) +#define SAFE_STRING(s) ((s)?(s):"") + #define STRING_CONSTANT(n,v) \ REGISTER_STRING_CONSTANT((n),(v),CONST_CS|CONST_PERSISTENT) @@ -117,7 +119,7 @@ #ifdef ZTS #define PEARG(v) (pear_globals->v) -#define PEARLS_FETCH() php_pear_globals *pear_globals = ts_resource(pear_globals_id) +#define PEARLS_FETCH() zend_pear_globals *pear_globals = ts_resource(pear_globals_id) #else #define PEARG(v) (pear_globals.v) #define PEARLS_FETCH() Index: pear/pear.dsw +++ pear/pear.dsw Microsoft Developer Studio Workspace File, Format Version 6.00 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! ############################################################################### Project: "pear"=".\PEAR\pear.dsp" - Package Owner=<4> Package=<5> {{{ }}} Package=<4> {{{ }}} ############################################################################### Global: Package=<5> {{{ }}} Package=<3> {{{ }}} ############################################################################### Index: pear/PEAR/pear.dsp +++ pear/PEAR/pear.dsp # Microsoft Developer Studio Project File - Name="pear" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 CFG=pear - 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 "pear.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 "pear.mak" CFG="pear - Win32 Debug_TS" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "pear - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "pear - 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)" == "pear - Win32 Release_TS" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "pear___Win32_Release_TS" # PROP BASE Intermediate_Dir "pear___Win32_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 /I "..\..\php4" /I "..\..\php4\Zend" /I "..\..\php4\TSRM" /I "..\..\php4\main" /I "..\..\php4\win32" /D "WIN32" /D "COMPILE_DL_PEAR" /D ZEND_DEBUG=0 /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZEND_WIN32" /D "PHP_WIN32" /D ZTS=1 /YX /FD /c # ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\php4" /I "..\..\php4\Zend" /I "..\..\php4\TSRM" /I "..\..\php4\main" /I "..\..\php4\win32" /D "WIN32" /D "COMPILE_DL_PEAR" /D ZEND_DEBUG=0 /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZEND_WIN32" /D "PHP_WIN32" /D ZTS=1 /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 kernel32.lib php4ts.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_pear.dll" /libpath:"..\..\php4\Release_TS_inline" /libpath:"..\..\php4\Release_TS" !ELSEIF "$(CFG)" == "pear - Win32 Debug_TS" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "pear___Win32_Debug_TS" # PROP BASE Intermediate_Dir "pear___Win32_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 /I "..\php4" /I "..\php4\Zend" /I "..\php4\TSRM" /I "..\php4\main" /I "..\php4\win32" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL_PEAR" /D "ZEND_WIN32" /D "PHP_WIN32" /D ZTS=1 /YX /FD /GZ /c # ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\php4" /I "..\php4\Zend" /I "..\php4\TSRM" /I "..\php4\main" /I "..\php4\win32" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL_PEAR" /D "ZEND_WIN32" /D "PHP_WIN32" /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 kernel32.lib php4ts_debug.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_pear.dll" /pdbtype:sept /libpath:"..\..\php4\Debug_TS" !ENDIF # Begin Target # Name "pear - Win32 Release_TS" # Name "pear - Win32 Debug_TS" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File SOURCE=.\pear.c # End Source File # End Group # Begin Group "Header Files" # PROP Default_Filter "h;hpp;hxx;hm;inl" # Begin Source File SOURCE=.\php_pear.h # End Source File # End Group # Begin Group "Resource Files" # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" # End Group # End Target # End Project
« previous php.pear.cvs (#103) next »