Add PHPAPI for Windows.

diff --git a/main/php_reentrancy.h b/main/php_reentrancy.h
index fe5fd011a4c6754ece5be37de25832b5480a42c3..d9cffb11a3eb8508e704111ebdb6c6716e7e7d68 100644 (file)
--- a/main/php_reentrancy.h
+++ b/main/php_reentrancy.h
@@ -36,38 +36,38 @@
 #if !defined(HAVE_LOCALTIME_R) && defined(HAVE_LOCALTIME)
 #define PHP_NEED_REENTRANCY 1
 #define localtime_r php_localtime_r
-struct tm *localtime_r(const time_t *const timep, struct tm *p_tm);
+PHPAPI struct tm *localtime_r(const time_t *const timep, struct tm *p_tm);
 #endif
 
 
 #if !defined(HAVE_CTIME_R) && defined(HAVE_CTIME)
 #define PHP_NEED_REENTRANCY 1
 #define ctime_r php_ctime_r
-char *ctime_r(const time_t *clock, char *buf);
+PHPAPI char *ctime_r(const time_t *clock, char *buf);
 #endif
 
 
 #if !defined(HAVE_ASCTIME_R) && defined(HAVE_ASCTIME)
 #define PHP_NEED_REENTRANCY 1
 #define asctime_r php_asctime_r
-char *asctime_r(const struct tm *tm, char *buf);
+PHPAPI char *asctime_r(const struct tm *tm, char *buf);
 #endif
 
 
 #if !defined(HAVE_GMTIME_R) && defined(HAVE_GMTIME)
 #define PHP_NEED_REENTRANCY 1
 #define gmtime_r php_gmtime_r
-struct tm *gmtime_r(const time_t *const timep, struct tm *p_tm);
+PHPAPI struct tm *gmtime_r(const time_t *const timep, struct tm *p_tm);
 #endif
 
 #if !defined(HAVE_STRTOK_R)
 #define strtok_r php_strtok_r
-char *strtok_r(char *s, const char *delim, char **last);
+PHPAPI char *strtok_r(char *s, const char *delim, char **last);
 #endif
 
 #if !defined(HAVE_RAND_R)
 #define rand_r php_rand_r
-int rand_r(unsigned int *seed);
+PHPAPI int rand_r(unsigned int *seed);
 #endif
 
 #if !defined(ZTS)

diff --git a/main/reentrancy.c b/main/reentrancy.c
index 2d10618c4c8b92736812e7ae981964e58734ac27..0faf76c4aa86911fdc0d49d017d0b62c338d7c7a 100644 (file)
--- a/main/reentrancy.c
+++ b/main/reentrancy.c
@@ -47,7 +47,7 @@ static MUTEX_T reentrant_locks[NUMBER_OF_LOCKS];
 
 #if !defined(HAVE_LOCALTIME_R) && defined(HAVE_LOCALTIME)
 
-struct tm *localtime_r(const time_t *const timep, struct tm *p_tm)
+PHPAPI struct tm *localtime_r(const time_t *const timep, struct tm *p_tm)
 {
        struct tm *tmp;
        
@@ -65,7 +65,7 @@ struct tm *localtime_r(const time_t *const timep, struct tm *p_tm)
 
 #if !defined(HAVE_CTIME_R) && defined(HAVE_CTIME)
 
-char *ctime_r(const time_t *clock, char *buf)
+PHPAPI char *ctime_r(const time_t *clock, char *buf)
 {
        char *tmp;
        
@@ -83,7 +83,7 @@ char *ctime_r(const time_t *clock, char *buf)
 
 #if !defined(HAVE_ASCTIME_R) && defined(HAVE_ASCTIME)
 
-char *asctime_r(const struct tm *tm, char *buf)
+PHPAPI char *asctime_r(const struct tm *tm, char *buf)
 {
        char *tmp;
        
@@ -101,7 +101,7 @@ char *asctime_r(const struct tm *tm, char *buf)
 
 #if !defined(HAVE_GMTIME_R) && defined(HAVE_GMTIME)
 
-struct tm *gmtime_r(const time_t *const timep, struct tm *p_tm)
+PHPAPI struct tm *gmtime_r(const time_t *const timep, struct tm *p_tm)
 {
        struct tm *tmp;
        
@@ -186,7 +186,7 @@ do_rand(unsigned long *ctx)
 }
 
 
-int
+PHPAPI int
 rand_r(unsigned int *ctx)
 {
        u_long val = (u_long) *ctx;
@@ -243,9 +243,8 @@ rand_r(unsigned int *ctx)
  */
 
 #include <stddef.h>
-#include <string.h>
 
-char *
+PHPAPI char *
 strtok_r(char *s, const char *delim, char **last)
 {
     char *spanp;