summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkrakjoe <joe.watkins@live.co.uk>2014-09-23 12:45:13 +0100
committerkrakjoe <joe.watkins@live.co.uk>2014-09-23 12:45:13 +0100
commit00320cae831eab9fb70d802e3f312d3b3714d18c (patch)
tree8de481684386bb6aa6270dea22dcc4c6f3e3dca8
parent51901c9fb4b55b5b80c335c8f6bfd5242b3fbbd6 (diff)
parentbec9fd79175758129bc95ff38aafb0a39f16c401 (diff)
downloadphp-git-00320cae831eab9fb70d802e3f312d3b3714d18c.tar.gz
Merge branch 'native-tls' of https://github.com/php/php-src into native-tls
-rw-r--r--TSRM/TSRM.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/TSRM/TSRM.h b/TSRM/TSRM.h
index 765d5d44a0..de211ad075 100644
--- a/TSRM/TSRM.h
+++ b/TSRM/TSRM.h
@@ -21,18 +21,21 @@
#endif
#ifdef TSRM_WIN32
+# define TSRM_EXP_API __declspec(dllexport)
+# define TSRM_IMP_API __declspec(dllimport)
# ifdef TSRM_EXPORTS
# define TSRM_API __declspec(dllexport)
# else
# define TSRM_API __declspec(dllimport)
# endif
-# define TSRM_EXP_API __declspec(dllexport)
#elif defined(__GNUC__) && __GNUC__ >= 4
# define TSRM_API __attribute__ ((visibility("default")))
# define TSRM_EXP_API TSRM_API
+# define TSRM_IMP_API TSRM_API
#else
# define TSRM_API
# define TSRM_EXP_API
+# define TSRM_IMP_API
#endif
#ifdef _WIN64