X-Git-Url: https://git.m6w6.name/?p=m6w6%2Flibmemcached;a=blobdiff_plain;f=include%2Flibmemcached-1.0%2Fplatform.h;h=1ab1bc075180c094f59b5a061ed3a773d7ec6cd3;hp=a3ccd3d737ded861284109cacba695b969154b49;hb=2f289c64f625962d945ec3bee80f36bc5c61ee35;hpb=4b584c02c679edd005cd2e542d2ff1d9dcb312b9

diff --git a/include/libmemcached-1.0/platform.h b/include/libmemcached-1.0/platform.h
index a3ccd3d7..1ab1bc07 100644
--- a/include/libmemcached-1.0/platform.h
+++ b/include/libmemcached-1.0/platform.h
@@ -17,25 +17,45 @@
 
 #include "libmemcached-1.0/configure.h"
 
-#if defined(_WIN32)
-#  include <winsock2.h>
-#  include <ws2tcpip.h>
+/* This seems to be required for older compilers @note
+ * http://stackoverflow.com/questions/8132399/how-to-printf-uint64-t  */
+#ifndef __STDC_FORMAT_MACROS
+#  define __STDC_FORMAT_MACROS
+#endif
+
+#ifdef __cplusplus
+#  include <cinttypes>
+#  include <cstddef>
+#  include <cstdlib>
+#else
+#  include <inttypes.h>
+#  include <stddef.h>
+#  include <stdlib.h>
+#  include <stdbool.h>
+#endif
+
+#include <sys/types.h>
 
-#  ifndef HAVE_IN_PORT_T
+#if defined HAVE_NETDB_H
+# include <netdb.h>
+#endif
+
+#if !defined HAVE_IN_PORT_T
 typedef int in_port_t;
-#    define HAVE_IN_PORT_T 1
-#  endif
+#endif
 
-typedef SOCKET memcached_socket_t;
+#if !defined HAVE_PID_T
+typedef int pid_t;
+#endif
 
-#else
-#  include <sys/socket.h>
-#  include <netinet/in.h>
-#  include <arpa/inet.h>
-#  include <netdb.h>
-#  include <sys/un.h>
-#  include <netinet/tcp.h>
+#ifndef HAVE_SSIZE_T
+typedef long int ssize_t;
+#endif
 
+#if defined _WIN32
+# include <winsock2.h>
+# include <ws2tcpip.h>
+typedef SOCKET memcached_socket_t;
+#else
 typedef int memcached_socket_t;
-
-#endif /* _WIN32 */
+#endif // _WIN32