diff options
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); |