X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Flibmemcached%2Fsocket.hpp;h=ed7810f7c06deb4fa571dec48b96c59589362118;hb=aeac01630eed825d8a624e7fd7c107d47bb2e40c;hp=a2ee941feed5f722bd97ff3c7868d2f31c2d44a1;hpb=5e760300d15ef4c5b7eed3fb9f37920ebca2f6ec;p=m6w6%2Flibmemcached

diff --git a/src/libmemcached/socket.hpp b/src/libmemcached/socket.hpp
index a2ee941f..ed7810f7 100644
--- a/src/libmemcached/socket.hpp
+++ b/src/libmemcached/socket.hpp
@@ -1,44 +1,20 @@
-/*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- * 
- *  LibMemcached
- *
- *  Copyright (C) 2011 Data Differential, http://datadifferential.com/
- *  Copyright (C) 2006-2009 Brian Aker
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are
- *  met:
- *
- *      * Redistributions of source code must retain the above copyright
- *  notice, this list of conditions and the following disclaimer.
- *
- *      * Redistributions in binary form must reproduce the above
- *  copyright notice, this list of conditions and the following disclaimer
- *  in the documentation and/or other materials provided with the
- *  distribution.
- *
- *      * The names of its contributors may not be used to endorse or
- *  promote products derived from this software without specific prior
- *  written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
+/*
+    +--------------------------------------------------------------------+
+    | libmemcached - 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.    |
+    | You should have received a copy of the license in a bundled file   |
+    | named LICENSE; in case you did not receive a copy you can review   |
+    | 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>                |
+    +--------------------------------------------------------------------+
+*/
 
 #pragma once
 
-
 /* To hide the platform differences between MS Windows and Unix, I am
  * going to use the Microsoft way and #define the Microsoft-specific
  * functions to the unix way. Microsoft use a separate subsystem for sockets,
@@ -47,34 +23,32 @@
  * way without side effect ;-)
  */
 #if defined(WIN32) || defined(__MINGW32__)
-# include "win32/wrappers.h"
-# define get_socket_errno() WSAGetLastError()
+#  include "win32/wrappers.h"
+#  include "windows.hpp"
+#  define get_socket_errno() translate_windows_error()
 #else
-# include <unistd.h>
-# define INVALID_SOCKET -1
-# define SOCKET_ERROR -1
-# define closesocket(a) close(a)
-# define get_socket_errno() errno
+#  include <unistd.h>
+#  define INVALID_SOCKET     -1
+#  define SOCKET_ERROR       -1
+#  define closesocket(a)     close(a)
+#  define get_socket_errno() errno
 #endif
 
 #ifdef __cplusplus
-static inline void memcached_close_socket(memcached_socket_t& socket_fd)
-{
+static inline void memcached_close_socket(memcached_socket_t &socket_fd) {
   closesocket(socket_fd);
-  socket_fd= INVALID_SOCKET;
+  socket_fd = INVALID_SOCKET;
 }
 #endif
 
 #ifndef HAVE_MSG_NOSIGNAL
-# define MSG_NOSIGNAL 0
+#  define MSG_NOSIGNAL 0
 #endif
 
 #ifndef HAVE_MSG_DONTWAIT
-# define MSG_DONTWAIT 0
+#  define MSG_DONTWAIT 0
 #endif
 
 #ifndef HAVE_MSG_MORE
-# define MSG_MORE 0
+#  define MSG_MORE 0
 #endif
-
-