cvs: php4 /ext/fdf fdf.c fdf.dsp /main SAPI.h php_open_temporary_file.c

dbeu Tue Nov 7 13:13:26 2000 EDT Modified files: /php4/ext/fdf fdf.c fdf.dsp /php4/main SAPI.h php_open_temporary_file.c Log: win32 sapi symbol export fixes Index: php4/ext/fdf/fdf.c diff -u php4/ext/fdf/fdf.c:1.35 php4/ext/fdf/fdf.c:1.36 --- php4/ext/fdf/fdf.c:1.35 Wed Oct 25 10:43:50 2000 +++ php4/ext/fdf/fdf.c Tue Nov 7 13:13:25 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: fdf.c,v 1.35 2000/10/25 17:43:50 andrei Exp $ */ +/* $Id: fdf.c,v 1.36 2000/11/07 21:13:25 dbeu Exp $ */ /* FdfTk lib 2.0 is a Complete C/C++ FDF Toolkit available from http://beta1.adobe.com/ada/acrosdk/forms.html. */ @@ -32,6 +32,8 @@ #include "SAPI.h" #include "ext/standard/head.h" #include "php_open_temporary_file.h" +#include "php_variables.h" + #include <math.h> #include "php_fdf.h" Index: php4/ext/fdf/fdf.dsp diff -u php4/ext/fdf/fdf.dsp:1.1 php4/ext/fdf/fdf.dsp:1.2 --- php4/ext/fdf/fdf.dsp:1.1 Thu Aug 24 10:56:38 2000 +++ php4/ext/fdf/fdf.dsp Tue Nov 7 13:13:25 2000 @@ -44,7 +44,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\..\TSRM" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL_FDF" /D ZTS=1 /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "..\..\main" /D ZEND_DEBUG=0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FDF_EXPORTS" /D "COMPILE_DL_FDF" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_FDFLIB=1 /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "..\..\main" /D ZEND_DEBUG=0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL_FDF" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_FDFLIB=1 /D "SAPI_EXPORTS" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x406 /d "NDEBUG" @@ -54,7 +54,7 @@ # 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 php4ts.lib /nologo /dll /machine:I386 -# ADD LINK32 php4ts.lib fdftk.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_fdf.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline" +# ADD LINK32 php4ts.lib fdftk.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_fdf.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline" # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "fdf - Win32 Debug_TS" @@ -72,7 +72,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "mssql-70" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL_FDF" /D ZTS=1 /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "..\..\main" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FDF_EXPORTS" /D "COMPILE_DL_FDF" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_FDFLIB=1 /FR /YX /FD /c +# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "..\..\main" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL_FDF" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_FDFLIB=1 /D "SAPI_EXPORTS" /FR /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x406 /d "NDEBUG" Index: php4/main/SAPI.h diff -u php4/main/SAPI.h:1.60 php4/main/SAPI.h:1.61 --- php4/main/SAPI.h:1.60 Tue Nov 7 10:12:06 2000 +++ php4/main/SAPI.h Tue Nov 7 13:13:26 2000 @@ -210,8 +210,8 @@ #define SAPI_DEFAULT_CHARSET "" #define SAPI_PHP_VERSION_HEADER "X-Powered-By: PHP/" PHP_VERSION -#define SAPI_POST_READER_FUNC(post_reader) void post_reader(SLS_D) -#define SAPI_POST_HANDLER_FUNC(post_handler) void post_handler(char *content_type_dup, void *arg SLS_DC) +#define SAPI_POST_READER_FUNC(post_reader) SAPI_API void post_reader(SLS_D) +#define SAPI_POST_HANDLER_FUNC(post_handler) SAPI_API void post_handler(char *content_type_dup, void *arg SLS_DC) SAPI_POST_READER_FUNC(sapi_read_standard_form_data); SAPI_POST_READER_FUNC(php_default_post_reader); Index: php4/main/php_open_temporary_file.c diff -u php4/main/php_open_temporary_file.c:1.3 php4/main/php_open_temporary_file.c:1.4 --- php4/main/php_open_temporary_file.c:1.3 Mon Sep 11 12:14:41 2000 +++ php4/main/php_open_temporary_file.c Tue Nov 7 13:13:26 2000 @@ -139,7 +139,7 @@ * This function should do its best to return a file pointer to a newly created * unique file, on every platform. */ -FILE *php_open_temporary_file(const char *dir, const char *pfx, char **opened_path_p) +PHPAPI FILE *php_open_temporary_file(const char *dir, const char *pfx, char **opened_path_p) { static char path_tmp[] = "/tmp"; FILE *fp;