diff options
| author | Sascha Schumann <sas@php.net> | 2000-05-04 10:38:17 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 2000-05-04 10:38:17 +0000 |
| commit | d0f3764ee2e10003d9c8ea4a1c17ff0be1303a9b (patch) | |
| tree | 10e61089a99c0d3226533f4b15693a45d82a931a /main/php_reentrancy.h | |
| parent | b6e4841ec7bcdc1b4fd3533fd4ffeefdac095d52 (diff) | |
| download | php-git-d0f3764ee2e10003d9c8ea4a1c17ff0be1303a9b.tar.gz | |
Change reentrancy API to always use the php prefix.
Check for the declaration of reentrant functions, so that we can use
them in non-ZTS mode on all platforms.
Diffstat (limited to 'main/php_reentrancy.h')
| -rw-r--r-- | main/php_reentrancy.h | 45 |
1 files changed, 33 insertions, 12 deletions
diff --git a/main/php_reentrancy.h b/main/php_reentrancy.h index 8b6ce5e8e1..fd76ce1339 100644 --- a/main/php_reentrancy.h +++ b/main/php_reentrancy.h @@ -42,39 +42,60 @@ #if !defined(HAVE_LOCALTIME_R) && defined(HAVE_LOCALTIME) #define PHP_NEED_REENTRANCY 1 -#define localtime_r php_localtime_r -PHPAPI struct tm *localtime_r(const time_t *const timep, struct tm *p_tm); +PHPAPI struct tm *php_localtime_r(const time_t *const timep, struct tm *p_tm); +#else +#define php_localtime_r localtime_r +#ifdef MISSING_LOCALTIME_R_DECL +struct tm *localtime_r(const time_t *const timep, struct tm *p_tm); +#endif #endif #if !defined(HAVE_CTIME_R) && defined(HAVE_CTIME) #define PHP_NEED_REENTRANCY 1 -#define ctime_r php_ctime_r -PHPAPI char *ctime_r(const time_t *clock, char *buf); +PHPAPI char *php_ctime_r(const time_t *clock, char *buf); +#else +#define php_ctime_r ctime_r +#ifdef MISSING_CTIME_R_DECL +char *ctime_r(const time_t *clock, char *buf); +#endif #endif #if !defined(HAVE_ASCTIME_R) && defined(HAVE_ASCTIME) #define PHP_NEED_REENTRANCY 1 -#define asctime_r php_asctime_r -PHPAPI char *asctime_r(const struct tm *tm, char *buf); +PHPAPI char *php_asctime_r(const struct tm *tm, char *buf); +#else +#define php_asctime_r asctime_r +#ifdef MISSING_ASCTIME_R_DECL +char *asctime_r(const struct tm *tm, char *buf); +#endif #endif #if !defined(HAVE_GMTIME_R) && defined(HAVE_GMTIME) #define PHP_NEED_REENTRANCY 1 -#define gmtime_r php_gmtime_r -PHPAPI struct tm *gmtime_r(const time_t *const timep, struct tm *p_tm); +PHPAPI struct tm *php_gmtime_r(const time_t *const timep, struct tm *p_tm); +#else +#define php_gmtime_r gmtime_r +#ifdef MISSING_GMTIME_R_DECL +struct tm *php_gmtime_r(const time_t *const timep, struct tm *p_tm); +#endif #endif #if !defined(HAVE_STRTOK_R) -#define strtok_r php_strtok_r -PHPAPI char *strtok_r(char *s, const char *delim, char **last); +PHPAPI char *php_strtok_r(char *s, const char *delim, char **last); +#else +#define php_strtok_r strtok_r +#ifdef MISSING_STRTOK_R_DECL +char *strtok_r(char *s, const char *delim, char **last); +#endif #endif #if !defined(HAVE_RAND_R) -#define rand_r php_rand_r -PHPAPI int rand_r(unsigned int *seed); +PHPAPI int php_rand_r(unsigned int *seed); +#else +#define php_rand_r rand_r #endif #if !defined(ZTS) |