Skip to content

Fix: sockets constants #9533

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 12 additions & 14 deletions ext/sockets/php_sockets.h
Original file line number Diff line number Diff line change
Expand Up @@ -183,10 +183,14 @@ PHP_SOCKETS_API int socket_import_file_descriptor(PHP_SOCKET socket, php_socket
#define PHP_SOCKET_EINVAL EINVAL
#endif

#ifdef ENFILE
#define PHP_SOCKET_ENFILE ENFILE
#endif

#ifdef WIN32
#define PHP_SOCKET_EMFILE WSAEMFILE
#elif defined(EMFILE)
#define PHP_SOCKET_ENFILE EMFILE
#define PHP_SOCKET_EMFILE EMFILE
#endif

#ifdef WIN32
Expand Down Expand Up @@ -257,7 +261,7 @@ PHP_SOCKETS_API int socket_import_file_descriptor(PHP_SOCKET socket, php_socket

#ifdef WIN32
#define PHP_SOCKET_EPFNOSUPPORT WSAEPFNOSUPPORT
#elif defined(EOPNOTSUPP)
#elif defined(EPFNOSUPPORT)
#define PHP_SOCKET_EPFNOSUPPORT EPFNOSUPPORT
#endif

Expand Down Expand Up @@ -293,8 +297,8 @@ PHP_SOCKETS_API int socket_import_file_descriptor(PHP_SOCKET socket, php_socket

#ifdef WIN32
#define PHP_SOCKET_ENETRESET WSAENETRESET
#elif defined(WSAENETRESET)
#define PHP_SOCKET_ENETRESET ENETUNREACH
#elif defined(ENETRESET)
#define PHP_SOCKET_ENETRESET ENETRESET
#endif

#ifdef WIN32
Expand All @@ -304,9 +308,9 @@ PHP_SOCKETS_API int socket_import_file_descriptor(PHP_SOCKET socket, php_socket
#endif

#ifdef WIN32
#define PHP_SOCKET_ECONNRESET WSAECONNABORTED
#elif defined(ECONNABORTED)
#define PHP_SOCKET_ECONNRESET ECONNABORTED
#define PHP_SOCKET_ECONNRESET WSAECONNRESET
#elif defined(ECONNRESET)
#define PHP_SOCKET_ECONNRESET ECONNRESET
#endif

#ifdef WIN32
Expand All @@ -329,16 +333,10 @@ PHP_SOCKETS_API int socket_import_file_descriptor(PHP_SOCKET socket, php_socket

#ifdef WIN32
#define PHP_SOCKET_ESHUTDOWN WSAESHUTDOWN
#elif defined(EISCONN)
#elif defined(ESHUTDOWN)
#define PHP_SOCKET_ESHUTDOWN ESHUTDOWN
#endif

#ifdef WIN32
#define PHP_SOCKET_ETOOMANYREFS WSAETOOMANYREFS
#elif defined(EISCONN)
#define PHP_SOCKET_ETOOMANYREFS ETOOMANYREFS
#endif

#ifdef WIN32
#define PHP_SOCKET_ETOOMANYREFS WSAETOOMANYREFS
#elif defined(ETOOMANYREFS)
Expand Down