projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
darwin: fix #90
[awesomized/libmemcached]
/
libmemcached-1.0
/
platform.h
diff --git
a/libmemcached-1.0/platform.h
b/libmemcached-1.0/platform.h
index 19248283f5d14d1ca0bae4010f67d64c4f31b50b..efdf53f81b495dd2ea2ad3f5bac8cbd9b554b6c8 100644
(file)
--- a/
libmemcached-1.0/platform.h
+++ b/
libmemcached-1.0/platform.h
@@
-2,8
+2,8
@@
*
* Libmemcached library
*
*
* Libmemcached library
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
- *
Copyright (C) 2006-2009 Brian Aker, Trond Norbye
All rights reserved.
+ * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@
-38,19
+38,25
@@
#pragma once
#pragma once
-#ifdef WIN32
+#if defined(_WIN32)
+# include <winsock2.h>
+# include <ws2tcpip.h>
+
+#ifndef HAVE_IN_PORT_T
+typedef int in_port_t;
+# define HAVE_IN_PORT_T 1
+#endif
-#include <winsock2.h>
-#include <ws2tcpip.h>
-typedef short in_port_t;
typedef SOCKET memcached_socket_t;
typedef SOCKET memcached_socket_t;
+
#else
#else
+# include <sys/socket.h>
+# include <netinet/in.h>
+# include <arpa/inet.h>
+# include <netdb.h>
+# include <sys/un.h>
+# include <netinet/tcp.h>
+
typedef int memcached_socket_t;
typedef int memcached_socket_t;
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <sys/un.h>
-#include <netinet/tcp.h>
-
-#endif /* WIN32 */
+
+#endif /* _WIN32 */