diff options
| -rw-r--r-- | win32/grp.h | 5 | ||||
| -rw-r--r-- | win32/inet.h | 4 | ||||
| -rw-r--r-- | win32/param.h | 5 | ||||
| -rw-r--r-- | win32/resource.h | 5 | ||||
| -rw-r--r-- | win32/select.h | 5 | ||||
| -rw-r--r-- | win32/sockets.h | 5 | ||||
| -rw-r--r-- | win32/winutil.h | 5 |
7 files changed, 34 insertions, 0 deletions
diff --git a/win32/grp.h b/win32/grp.h index 8a086a5bbf..f4a52f4dfd 100644 --- a/win32/grp.h +++ b/win32/grp.h @@ -18,6 +18,9 @@ /* $Id$ */ +#ifndef PHP_WIN32_GRP_H +#define PHP_WIN32_GRP_H + struct group { char *gr_name; char *gr_passwd; @@ -25,6 +28,8 @@ struct group { char **gr_mem; }; +#endif + /* * Local variables: * tab-width: 4 diff --git a/win32/inet.h b/win32/inet.h index f8b2704e0e..eb6b3eb85f 100644 --- a/win32/inet.h +++ b/win32/inet.h @@ -16,12 +16,16 @@ +----------------------------------------------------------------------+ */ +#ifndef PHP_WIN32_INET_H +#define PHP_WIN32_INET_H #include <php.h> #include <Winsock2.h> PHPAPI int inet_aton(const char *cp, struct in_addr *inp); +#endif + /* * Local variables: * tab-width: 4 diff --git a/win32/param.h b/win32/param.h index 885a3b66a4..1601a3cc16 100644 --- a/win32/param.h +++ b/win32/param.h @@ -8,6 +8,9 @@ * Copyright 1994 The Downhill Project * * * *****************************************************************************/ +#ifndef PHP_WIN32_PARAM_H +#define PHP_WIN32_PARAM_H + #ifndef MAXPATHLEN #include "win32/ioutil.h" #define MAXPATHLEN PHP_WIN32_IOUTIL_MAXPATHLEN @@ -16,6 +19,8 @@ #define howmany(x,y) (((x)+((y)-1))/(y)) #define roundup(x,y) ((((x)+((y)-1))/(y))*(y)) +#endif + /* * Local variables: * tab-width: 4 diff --git a/win32/resource.h b/win32/resource.h index ef17e01d1c..05e3111512 100644 --- a/win32/resource.h +++ b/win32/resource.h @@ -3,6 +3,9 @@ // Used by php7dllts.rc // +#ifndef PHP_WIN32_RESOURCE_H +#define PHP_WIN32_RESOURCE_H + // Next default values for new objects // #ifdef APSTUDIO_INVOKED @@ -14,6 +17,8 @@ #endif #endif +#endif + /* * Local variables: * tab-width: 4 diff --git a/win32/select.h b/win32/select.h index 1250444055..ac0572f819 100644 --- a/win32/select.h +++ b/win32/select.h @@ -18,10 +18,15 @@ /* $Id$ */ +#ifndef PHP_WIN32_SELECT_H +#define PHP_WIN32_SELECT_H + #include "php_network.h" PHPAPI int php_select(php_socket_t max_fd, fd_set *rfds, fd_set *wfds, fd_set *efds, struct timeval *tv); +#endif + /* * Local variables: * tab-width: 4 diff --git a/win32/sockets.h b/win32/sockets.h index 4c1237ce8b..008587caef 100644 --- a/win32/sockets.h +++ b/win32/sockets.h @@ -23,8 +23,13 @@ /* Code originally from ext/sockets */ +#ifndef PHP_WIN32_SOCKETS_H +#define PHP_WIN32_SOCKETS_H + PHPAPI int socketpair(int domain, int type, int protocol, SOCKET sock[2]); +#endif + /* * Local variables: * tab-width: 4 diff --git a/win32/winutil.h b/win32/winutil.h index 364c9bc2cb..d4d3700f20 100644 --- a/win32/winutil.h +++ b/win32/winutil.h @@ -16,6 +16,9 @@ +----------------------------------------------------------------------+ */ +#ifndef PHP_WIN32_WINUTIL_H +#define PHP_WIN32_WINUTIL_H + #ifdef PHP_EXPORTS # define PHP_WINUTIL_API __declspec(dllexport) #else @@ -50,6 +53,8 @@ PHP_WINUTIL_API int php_win32_code_to_errno(unsigned long w32Err); PHP_WINUTIL_API char *php_win32_get_username(void); +#endif + /* * Local variables: * tab-width: 4 |