diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/config.w32.h | 1 | ||||
| -rw-r--r-- | main/php.h | 4 | ||||
| -rw-r--r-- | main/php_globals.h | 2 | ||||
| -rw-r--r-- | main/php_ini.c | 8 | ||||
| -rw-r--r-- | main/php_ini.h | 8 |
5 files changed, 10 insertions, 13 deletions
diff --git a/main/config.w32.h b/main/config.w32.h index c065296239..ba1827b102 100644 --- a/main/config.w32.h +++ b/main/config.w32.h @@ -37,7 +37,6 @@ ---------------------------------------------------------------*/ #if !defined(COMPILE_DL) #define HAVE_SNMP 0 -#define HAVE_MYSQL 0 # define HAVE_ERRMSG_H 0 /*needed for mysql 3.21.17 and up*/ #define HAVE_LDAP 0 #define DBASE 0 diff --git a/main/php.h b/main/php.h index 955cbe66ca..8872f198a0 100644 --- a/main/php.h +++ b/main/php.h @@ -190,7 +190,7 @@ extern char *strerror(int); #endif #if HAVE_PWD_H -# if MSVC5 +# if WIN32||WINNT #include "win32/pwd.h" #include "win32/param.h" # else @@ -258,8 +258,6 @@ extern pval *data; extern char **environ; #endif -extern PHPAPI int le_index_ptr; /* list entry type for index pointers */ - extern void phperror(char *error); extern PHPAPI void php3_error(int type, const char *format,...); extern PHPAPI int php3_printf(const char *format,...); diff --git a/main/php_globals.h b/main/php_globals.h index ea2597e6a6..7dd5cf4002 100644 --- a/main/php_globals.h +++ b/main/php_globals.h @@ -12,7 +12,7 @@ typedef struct _php_core_globals php_core_globals; # define PLS_CC , PLS_C # define PG(v) (core_globals->v) # define PLS_FETCH() php_core_globals *core_globals = ts_resource(core_globals_id) -PHPAPI extern int core_globals_id; +extern PHPAPI int core_globals_id; #else # define PLS_D # define PLS_DC diff --git a/main/php_ini.c b/main/php_ini.c index e5b219eea6..610e85ce12 100644 --- a/main/php_ini.c +++ b/main/php_ini.c @@ -351,7 +351,7 @@ PHPAPI void display_ini_entries(zend_module_entry *module) /* Standard message handlers */ -PHP_INI_MH(OnUpdateInt) +PHPAPI PHP_INI_MH(OnUpdateInt) { long *p; #ifndef ZTS @@ -369,7 +369,7 @@ PHP_INI_MH(OnUpdateInt) } -PHP_INI_MH(OnUpdateReal) +PHPAPI PHP_INI_MH(OnUpdateReal) { double *p; #ifndef ZTS @@ -387,7 +387,7 @@ PHP_INI_MH(OnUpdateReal) } -PHP_INI_MH(OnUpdateString) +PHPAPI PHP_INI_MH(OnUpdateString) { char **p; #ifndef ZTS @@ -405,7 +405,7 @@ PHP_INI_MH(OnUpdateString) } -PHP_INI_MH(OnUpdateStringUnempty) +PHPAPI PHP_INI_MH(OnUpdateStringUnempty) { char **p; #ifndef ZTS diff --git a/main/php_ini.h b/main/php_ini.h index 09a9f62c1b..dc57089588 100644 --- a/main/php_ini.h +++ b/main/php_ini.h @@ -111,10 +111,10 @@ pval *cfg_get_entry(char *name, uint name_length); /* Standard message handlers */ -PHP_INI_MH(OnUpdateInt); -PHP_INI_MH(OnUpdateReal); -PHP_INI_MH(OnUpdateString); -PHP_INI_MH(OnUpdateStringUnempty); +PHPAPI PHP_INI_MH(OnUpdateInt); +PHPAPI PHP_INI_MH(OnUpdateReal); +PHPAPI PHP_INI_MH(OnUpdateString); +PHPAPI PHP_INI_MH(OnUpdateStringUnempty); #define PHP_INI_DISPLAY_ORIG 1 |