X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=include%2Flibmemcached-1.0%2Fplatform.h;h=f2e85491dcae141ea8b88086c63f11579695a822;hb=28153bf5c12d2baa134f7ad4f7d948df04f8590e;hp=a3ccd3d737ded861284109cacba695b969154b49;hpb=6b7d2bf0319e0bd48bd6aa4ad8c56a935f98b0d2;p=awesomized%2Flibmemcached

diff --git a/include/libmemcached-1.0/platform.h b/include/libmemcached-1.0/platform.h
index a3ccd3d7..f2e85491 100644
--- a/include/libmemcached-1.0/platform.h
+++ b/include/libmemcached-1.0/platform.h
@@ -1,6 +1,6 @@
 /*
     +--------------------------------------------------------------------+
-    | libmemcached - C/C++ Client Library for memcached                  |
+    | libmemcached-awesome - C/C++ Client Library for memcached          |
     +--------------------------------------------------------------------+
     | Redistribution and use in source and binary forms, with or without |
     | modification, are permitted under the terms of the BSD license.    |
@@ -9,7 +9,7 @@
     | the terms online at: https://opensource.org/licenses/BSD-3-Clause  |
     +--------------------------------------------------------------------+
     | Copyright (c) 2006-2014 Brian Aker   https://datadifferential.com/ |
-    | Copyright (c) 2020 Michael Wallner   <mike@php.net>                |
+    | Copyright (c) 2020-2021 Michael Wallner        https://awesome.co/ |
     +--------------------------------------------------------------------+
 */
 
@@ -17,25 +17,47 @@
 
 #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
 
-#  ifndef HAVE_IN_PORT_T
+#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>
+
+#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
+# define WINVER 0x0600
+# define _WIN32_WINNT 0x0600
+# include <winsock2.h>
+# include <ws2tcpip.h>
+typedef SOCKET memcached_socket_t;
+#else
 typedef int memcached_socket_t;
-
-#endif /* _WIN32 */
+#endif // _WIN32