Update

[awesomized/libmemcached] / m4 / bottom.m4

diff --git a/m4/bottom.m4 b/m4/bottom.m4
index 55591be4fe117b8267897223af5ad1c9b1662d06..135cb976dcc7436022e76af2307d8205847e15f2 100644 (file)
--- a/m4/bottom.m4
+++ b/m4/bottom.m4
@@ -1,55 +1,36 @@
 AC_DEFUN([CONFIG_EXTRA], [
 
-AH_BOTTOM([
+AH_TOP([
+#pragma once
 
-#if defined(__cplusplus) 
-#include CSTDINT_H 
-#include CINTTYPES_H 
-#else 
-#include <stdint.h> 
-#include <inttypes.h> 
-#endif
-
-#if !defined(HAVE_ULONG) && !defined(__USE_MISC)
-# define HAVE_ULONG 1
-typedef unsigned long int ulong;
+/* _SYS_FEATURE_TESTS_H is Solaris, _FEATURES_H is GCC */
+#if defined( _SYS_FEATURE_TESTS_H) || defined(_FEATURES_H)
+#error "You should include config.h as your first include file"
 #endif
 
 ])
 
 AH_BOTTOM([
-#ifdef WIN32
-#define _WIN32_WINNT 0x0501
-#endif
 
-/* 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,
- * but Unix normally just use a filedescriptor on the same functions. It is
- * a lot easier to map back to the unix way with macros than going the other
- * way without side effect ;-)
- */
-#ifdef WIN32
-#include "win32/wrappers.h"
-#define get_socket_errno() WSAGetLastError()
-#else
-#define INVALID_SOCKET -1
-#define SOCKET_ERROR -1
-#define closesocket(a) close(a)
-#define get_socket_errno() errno
+#ifndef __STDC_FORMAT_MACROS
+#  define __STDC_FORMAT_MACROS
 #endif
-
-#ifndef HAVE_MSG_NOSIGNAL
-#define MSG_NOSIGNAL 0
+ 
+#if defined(__cplusplus) 
+#  include CINTTYPES_H 
+#else 
+#  include <inttypes.h> 
 #endif
 
-#ifndef HAVE_MSG_DONTWAIT
-#define MSG_DONTWAIT 0
-#endif
+#if !defined(HAVE_ULONG) && !defined(__USE_MISC)
+# define HAVE_ULONG 1
+typedef unsigned long int ulong;
+#endif 
 
-#ifndef HAVE_MSG_MORE
-#define MSG_MORE 0
-#endif
+#define RPACKAGE "memcached" 
+ 
+#define RVERSION "1.4.13"
 
 ])
+
 ])dnl CONFIG_EXTRA