summaryrefslogtreecommitdiff
path: root/win32/inet.c
diff options
context:
space:
mode:
authorGustavo Lopes <glopes@nebm.ist.utl.pt>2013-01-30 21:40:45 +0100
committerGustavo Lopes <glopes@nebm.ist.utl.pt>2013-02-02 16:38:09 +0100
commit8561680533c7fd6b66497ed10246fe9e57e9d351 (patch)
treeb6c329725b2109b33cc517d45f7c4b01c33f672d /win32/inet.c
parent95f8d34f9c0980924098ce9554e899e461ce7cec (diff)
downloadphp-git-8561680533c7fd6b66497ed10246fe9e57e9d351.tar.gz
Remove some pre-vista code
Diffstat (limited to 'win32/inet.c')
-rw-r--r--win32/inet.c79
1 files changed, 0 insertions, 79 deletions
diff --git a/win32/inet.c b/win32/inet.c
index d424c8a546..686cf1265c 100644
--- a/win32/inet.c
+++ b/win32/inet.c
@@ -1,83 +1,4 @@
-#include "config.w32.h"
-#include "php.h"
-#include <winsock2.h>
-#include <windows.h>
-#include <Ws2tcpip.h>
-
#include "inet.h"
-#if (_WIN32_WINNT < 0x0600) /* Vista/2k8 have these functions */
-
-
-PHPAPI int inet_pton(int af, const char* src, void* dst)
-{
- int address_length;
- struct sockaddr_storage sa;
- struct sockaddr_in *sin = (struct sockaddr_in *)&sa;
- struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)&sa;
-
- switch (af) {
- case AF_INET:
- address_length = sizeof (struct sockaddr_in);
- break;
-
- case AF_INET6:
- address_length = sizeof (struct sockaddr_in6);
- break;
-
- default:
- return -1;
- }
-
- if (WSAStringToAddress ((LPTSTR) src, af, NULL, (LPSOCKADDR) &sa, &address_length) == 0) {
- switch (af) {
- case AF_INET:
- memcpy (dst, &sin->sin_addr, sizeof (struct in_addr));
- break;
-
- case AF_INET6:
- memcpy (dst, &sin6->sin6_addr, sizeof (struct in6_addr));
- break;
- }
- return 1;
- }
-
- return 0;
-}
-
-PHPAPI const char* inet_ntop(int af, const void* src, char* dst, size_t size)
-{
- int address_length;
- DWORD string_length = size;
- struct sockaddr_storage sa;
- struct sockaddr_in *sin = (struct sockaddr_in *)&sa;
- struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)&sa;
-
- memset (&sa, 0, sizeof (sa));
- switch (af) {
- case AF_INET:
- address_length = sizeof (struct sockaddr_in);
- sin->sin_family = af;
- memcpy (&sin->sin_addr, src, sizeof (struct in_addr));
- break;
-
- case AF_INET6:
- address_length = sizeof (struct sockaddr_in6);
- sin6->sin6_family = af;
- memcpy (&sin6->sin6_addr, src, sizeof (struct in6_addr));
- break;
-
- default:
- return NULL;
- }
-
- if (WSAAddressToString ((LPSOCKADDR) &sa, address_length, NULL, dst, &string_length) == 0) {
- return dst;
- }
-
- return NULL;
-}
-
-#endif
int inet_aton(const char *cp, struct in_addr *inp) {
inp->s_addr = inet_addr(cp);