diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-09-08 22:51:46 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-09-08 22:54:21 +0200 |
| commit | 95cf7a0358dcb50d0e1b6efca5f1f33455b29f22 (patch) | |
| tree | 2ebc2627d9189d1f18edb4d3a316ac44aea1f65d /ext/sockets | |
| parent | cf8d7b3eaed6f38eafaaad7e6f384627e87ba3b5 (diff) | |
| download | php-git-95cf7a0358dcb50d0e1b6efca5f1f33455b29f22.tar.gz | |
Fix Windows build for shared ext/sockets
We can't use `PHPAPI` for extensions which may be built shared. Thus,
we introduce `PHP_SOCKETS_API`.
Diffstat (limited to 'ext/sockets')
| -rw-r--r-- | ext/sockets/config.w32 | 1 | ||||
| -rw-r--r-- | ext/sockets/php_sockets.h | 20 |
2 files changed, 17 insertions, 4 deletions
diff --git a/ext/sockets/config.w32 b/ext/sockets/config.w32 index aeb419c4f0..ad9becab2a 100644 --- a/ext/sockets/config.w32 +++ b/ext/sockets/config.w32 @@ -9,6 +9,7 @@ if (PHP_SOCKETS != "no") { EXTENSION('sockets', 'sockets.c multicast.c conversions.c sockaddr_conv.c sendrecvmsg.c', PHP_SOCKETS_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); AC_DEFINE('HAVE_SOCKETS', 1); PHP_INSTALL_HEADERS("ext/sockets", "php_sockets.h windows_common.h"); + ADD_FLAG("CFLAGS_SOCKETS", "/D PHP_SOCKETS_EXPORTS=1"); } else { WARNING("sockets not enabled; libraries and headers not found"); } diff --git a/ext/sockets/php_sockets.h b/ext/sockets/php_sockets.h index 7be3c4e9ea..e31ebc7530 100644 --- a/ext/sockets/php_sockets.h +++ b/ext/sockets/php_sockets.h @@ -52,6 +52,18 @@ typedef int PHP_SOCKET; typedef SOCKET PHP_SOCKET; #endif +#ifdef PHP_WIN32 +# ifdef PHP_SOCKETS_EXPORTS +# define PHP_SOCKETS_API __declspec(dllexport) +# else +# define PHP_SOCKETS_API __declspec(dllimport) +# endif +#elif defined(__GNUC__) && __GNUC__ >= 4 +# define PHP_SOCKETS_API __attribute__ ((visibility("default"))) +#else +# define PHP_SOCKETS_API +#endif + /* Socket class */ typedef struct { @@ -63,7 +75,7 @@ typedef struct { zend_object std; } php_socket; -extern PHPAPI zend_class_entry *socket_ce; +extern PHP_SOCKETS_API zend_class_entry *socket_ce; static inline php_socket *socket_from_obj(zend_object *obj) { return (php_socket *)((char *)(obj) - XtOffsetOf(php_socket, std)); @@ -104,7 +116,7 @@ ZEND_BEGIN_MODULE_GLOBALS(sockets) #endif ZEND_END_MODULE_GLOBALS(sockets) -PHPAPI ZEND_EXTERN_MODULE_GLOBALS(sockets) +PHP_SOCKETS_API ZEND_EXTERN_MODULE_GLOBALS(sockets) #define SOCKETS_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(sockets, v) enum sockopt_return { @@ -113,8 +125,8 @@ enum sockopt_return { SOCKOPT_SUCCESS }; -PHPAPI char *sockets_strerror(int error); -PHPAPI int socket_import_file_descriptor(PHP_SOCKET socket, php_socket *retsock); +PHP_SOCKETS_API char *sockets_strerror(int error); +PHP_SOCKETS_API int socket_import_file_descriptor(PHP_SOCKET socket, php_socket *retsock); #else #define phpext_sockets_ptr NULL |