X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=m4%2Fbottom.m4;h=6306aee178a873508c98976a5ea32c86dfba1019;hb=e229a51b6a425b7715050242afb57443afcc463d;hp=55591be4fe117b8267897223af5ad1c9b1662d06;hpb=7dcb622a0e97c227db598b8b50767bf9e0eaa6bd;p=awesomized%2Flibmemcached diff --git a/m4/bottom.m4 b/m4/bottom.m4 index 55591be4..6306aee1 100644 --- a/m4/bottom.m4 +++ b/m4/bottom.m4 @@ -1,55 +1,42 @@ AC_DEFUN([CONFIG_EXTRA], [ +AH_TOP([ +#pragma once + +/* _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([ +#ifndef __STDC_FORMAT_MACROS +# define __STDC_FORMAT_MACROS +#endif + #if defined(__cplusplus) -#include CSTDINT_H -#include CINTTYPES_H +# include CINTTYPES_H #else -#include -#include +# include #endif #if !defined(HAVE_ULONG) && !defined(__USE_MISC) # define HAVE_ULONG 1 typedef unsigned long int ulong; -#endif +#endif -]) +#define RPACKAGE "memcached" + +#define RVERSION "1.4.13" -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() +#ifdef WORDS_BIGENDIAN +# define ENDIAN_BIG 1 #else -#define INVALID_SOCKET -1 -#define SOCKET_ERROR -1 -#define closesocket(a) close(a) -#define get_socket_errno() errno -#endif - -#ifndef HAVE_MSG_NOSIGNAL -#define MSG_NOSIGNAL 0 -#endif - -#ifndef HAVE_MSG_DONTWAIT -#define MSG_DONTWAIT 0 +# define ENDIAN_LITTLE 1 #endif - -#ifndef HAVE_MSG_MORE -#define MSG_MORE 0 -#endif - + ]) + ])dnl CONFIG_EXTRA