com php-src: fix zts build on mac/clang: TSRM/TSRM.c TSRM/TSRM.h
| From: | Ferenc Kovacs | Date: | Sun, 21 Dec 2014 19:01:39 +0000 |
| Subject: | com php-src: fix zts build on mac/clang: TSRM/TSRM.c TSRM/TSRM.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83814@lists.php.net to get a copy of this message | ||
Commit: a9e86957c70c181e830ba05bb030c468d0cb15e1
Author: Ferenc Kovacs <tyrael@php.net> Sun, 21 Dec 2014 20:01:39 +0100
Parents: e5eb9530ab13a174feee83a81d87bfceee37bd88
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a9e86957c70c181e830ba05bb030c468d0cb15e1
Log:
fix zts build on mac/clang
Changed paths:
M TSRM/TSRM.c
M TSRM/TSRM.h
Diff:
diff --git a/TSRM/TSRM.c b/TSRM/TSRM.c
index 8235b48..c7d3fd4 100644
--- a/TSRM/TSRM.c
+++ b/TSRM/TSRM.c
@@ -795,7 +795,7 @@ void tsrm_error_set(int level, char *debug_filename)
#endif
}
-TSRM_API inline void *tsrm_get_ls_cache(void)
+TSRM_API void *tsrm_get_ls_cache(void)
{
return tsrm_tls_get();
}
diff --git a/TSRM/TSRM.h b/TSRM/TSRM.h
index d3891b7..e634592 100644
--- a/TSRM/TSRM.h
+++ b/TSRM/TSRM.h
@@ -155,7 +155,7 @@ TSRM_API void *tsrm_new_interpreter_context(void);
TSRM_API void *tsrm_set_interpreter_context(void *new_ctx);
TSRM_API void tsrm_free_interpreter_context(void *context);
-TSRM_API inline void *tsrm_get_ls_cache(void);
+TSRM_API void *tsrm_get_ls_cache(void);
#ifdef TSRM_WIN32
# define TSRM_TLS __declspec(thread)