diff options
| author | Zeev Suraski <zeev@php.net> | 1999-04-26 14:00:49 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 1999-04-26 14:00:49 +0000 |
| commit | 7942eaf38138ef8751a447dadb930a129528fb6b (patch) | |
| tree | cee4b5eca81082809a9e5bb903173952f45e9501 /main/php.h | |
| parent | 050cb7cfe3da61621b6d01a0b013642543f44521 (diff) | |
| download | php-git-7942eaf38138ef8751a447dadb930a129528fb6b.tar.gz | |
* Plenty of thread safety and Win32 work.
* Changed PHP4 to compile as a DLL, both ISAPI and the the CGI run with the same DLL.
* Switched to using the DLL runtime library under Win32. PHP will NOT work if
compiled against the static library!
* Removed yesterday's php4libts project (with php4dllts, it's obsolete).
This *does* affect thread-unsafe Windows as well - the thread unsafe CGI is also
dependant on the thread-unsafe DLL.
Diffstat (limited to 'main/php.h')
| -rw-r--r-- | main/php.h | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/main/php.h b/main/php.h index d66976e58b..ab4a159069 100644 --- a/main/php.h +++ b/main/php.h @@ -69,15 +69,15 @@ extern unsigned char second_arg_allow_ref[]; #if WIN32 #include "config.w32.h" #include "win95nt.h" -# if defined(COMPILE_DL) -# define PHPAPI __declspec(dllimport) -# else -# define PHPAPI __declspec(dllexport) -# endif +# ifdef PHP_EXPORTS +# define PHPAPI __declspec(dllexport) +# else +# define PHPAPI __declspec(dllimport) +# endif #else -# include "config.h" -# define PHPAPI -# define THREAD_LS +#include "config.h" +#define PHPAPI +#define THREAD_LS #endif @@ -314,12 +314,11 @@ extern PHPAPI int php3_fhttpd_write(char *a,int n); /* global variables */ -#ifndef THREAD_SAFE extern pval *data; -#if (!PHP_ISAPI) +#if !(WIN32||WINNT) extern char **environ; #endif -#endif + extern PHPAPI int le_index_ptr; /* list entry type for index pointers */ extern void phperror(char *error); |