Skip to content

Commit 64a22c8

Browse files
Revert to 1.34.
1 parent 99f2fc8 commit 64a22c8

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

main/php_network.h

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@
2121
#define _PHP_NETWORK_H
2222

2323
#ifdef PHP_WIN32
24-
#ifndef WINNT
25-
#define WINNT 1
26-
#endif
27-
#undef FD_SETSIZE
28-
#include "arpa/inet.h"
29-
#define socklen_t unsigned int
24+
# ifndef WINNT
25+
# define WINNT 1
26+
# endif
27+
# undef FD_SETSIZE
28+
# include "arpa/inet.h"
29+
# define socklen_t unsigned int
3030
#else
31-
#undef closesocket
32-
#define closesocket close
31+
# undef closesocket
32+
# define closesocket close
3333
#endif
3434

3535
#ifndef HAVE_SHUTDOWN
@@ -55,7 +55,7 @@
5555
PHPAPI char *php_socket_strerror(long err, char *buf, size_t bufsize);
5656

5757
#ifdef HAVE_NETINET_IN_H
58-
#include <netinet/in.h>
58+
# include <netinet/in.h>
5959
#endif
6060

6161
#ifdef HAVE_SYS_SOCKET_H
@@ -65,9 +65,9 @@ PHPAPI char *php_socket_strerror(long err, char *buf, size_t bufsize);
6565
/* These are here, rather than with the win32 counterparts above,
6666
* since <sys/socket.h> defines them. */
6767
#ifndef SHUT_RD
68-
#define SHUT_RD 0
69-
#define SHUT_WR 1
70-
#define SHUT_RDWR 2
68+
# define SHUT_RD 0
69+
# define SHUT_WR 1
70+
# define SHUT_RDWR 2
7171
#endif
7272

7373
#ifdef HAVE_SYS_TIME_H
@@ -83,13 +83,13 @@ PHPAPI char *php_socket_strerror(long err, char *buf, size_t bufsize);
8383
#endif
8484

8585
#ifdef PHP_WIN32
86-
#define SOCK_ERR INVALID_SOCKET
87-
#define SOCK_CONN_ERR SOCKET_ERROR
88-
#define SOCK_RECV_ERR SOCKET_ERROR
86+
# define SOCK_ERR INVALID_SOCKET
87+
# define SOCK_CONN_ERR SOCKET_ERROR
88+
# define SOCK_RECV_ERR SOCKET_ERROR
8989
#else
90-
#define SOCK_ERR -1
91-
#define SOCK_CONN_ERR -1
92-
#define SOCK_RECV_ERR -1
90+
# define SOCK_ERR -1
91+
# define SOCK_CONN_ERR -1
92+
# define SOCK_RECV_ERR -1
9393
#endif
9494

9595
#define PHP_SOCK_CHUNK_SIZE 8192

0 commit comments

Comments
 (0)