Skip to content

Commit 95cf7a0

Browse files
committed
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`.
1 parent cf8d7b3 commit 95cf7a0

File tree

2 files changed

+17
-4
lines changed

2 files changed

+17
-4
lines changed

ext/sockets/config.w32

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ if (PHP_SOCKETS != "no") {
99
EXTENSION('sockets', 'sockets.c multicast.c conversions.c sockaddr_conv.c sendrecvmsg.c', PHP_SOCKETS_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
1010
AC_DEFINE('HAVE_SOCKETS', 1);
1111
PHP_INSTALL_HEADERS("ext/sockets", "php_sockets.h windows_common.h");
12+
ADD_FLAG("CFLAGS_SOCKETS", "/D PHP_SOCKETS_EXPORTS=1");
1213
} else {
1314
WARNING("sockets not enabled; libraries and headers not found");
1415
}

ext/sockets/php_sockets.h

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,18 @@ typedef int PHP_SOCKET;
5252
typedef SOCKET PHP_SOCKET;
5353
#endif
5454

55+
#ifdef PHP_WIN32
56+
# ifdef PHP_SOCKETS_EXPORTS
57+
# define PHP_SOCKETS_API __declspec(dllexport)
58+
# else
59+
# define PHP_SOCKETS_API __declspec(dllimport)
60+
# endif
61+
#elif defined(__GNUC__) && __GNUC__ >= 4
62+
# define PHP_SOCKETS_API __attribute__ ((visibility("default")))
63+
#else
64+
# define PHP_SOCKETS_API
65+
#endif
66+
5567
/* Socket class */
5668

5769
typedef struct {
@@ -63,7 +75,7 @@ typedef struct {
6375
zend_object std;
6476
} php_socket;
6577

66-
extern PHPAPI zend_class_entry *socket_ce;
78+
extern PHP_SOCKETS_API zend_class_entry *socket_ce;
6779

6880
static inline php_socket *socket_from_obj(zend_object *obj) {
6981
return (php_socket *)((char *)(obj) - XtOffsetOf(php_socket, std));
@@ -104,7 +116,7 @@ ZEND_BEGIN_MODULE_GLOBALS(sockets)
104116
#endif
105117
ZEND_END_MODULE_GLOBALS(sockets)
106118

107-
PHPAPI ZEND_EXTERN_MODULE_GLOBALS(sockets)
119+
PHP_SOCKETS_API ZEND_EXTERN_MODULE_GLOBALS(sockets)
108120
#define SOCKETS_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(sockets, v)
109121

110122
enum sockopt_return {
@@ -113,8 +125,8 @@ enum sockopt_return {
113125
SOCKOPT_SUCCESS
114126
};
115127

116-
PHPAPI char *sockets_strerror(int error);
117-
PHPAPI int socket_import_file_descriptor(PHP_SOCKET socket, php_socket *retsock);
128+
PHP_SOCKETS_API char *sockets_strerror(int error);
129+
PHP_SOCKETS_API int socket_import_file_descriptor(PHP_SOCKET socket, php_socket *retsock);
118130

119131
#else
120132
#define phpext_sockets_ptr NULL

0 commit comments

Comments
 (0)