From 3d320253cd8748eeb4accc0f97ac1eee4f38a63c Mon Sep 17 00:00:00 2001 From: Leo Yuriev Date: Wed, 21 Mar 2018 21:57:59 +0300 Subject: [PATCH] mdbx-tests: drop duplicate sysdep-includes. --- test/base.h | 8 -------- test/utils.cc | 34 ---------------------------------- test/utils.h | 25 ------------------------- 3 files changed, 67 deletions(-) diff --git a/test/base.h b/test/base.h index 63554e73..f0c60432 100644 --- a/test/base.h +++ b/test/base.h @@ -76,14 +76,6 @@ #include #include -#ifdef _MSC_VER -#include -#endif - -#if defined(__i386__) || defined(__x86_64__) -#include -#endif - #include "../mdbx.h" #include "../src/defs.h" #include "../src/osal.h" diff --git a/test/utils.cc b/test/utils.cc index 20a0ce90..da4e8673 100644 --- a/test/utils.cc +++ b/test/utils.cc @@ -18,40 +18,6 @@ #include #endif -/* Compiler's includes for builtins/intrinsics */ -#if defined(_MSC_VER) || defined(__INTEL_COMPILER) -#include -#elif __GNUC_PREREQ(4, 4) || defined(__clang__) -#if defined(__ia32__) || defined(__e2k__) -#include -#endif /* __ia32__ */ -#if defined(__ia32__) -#include -#endif /* __ia32__ */ -#elif defined(__SUNPRO_C) || defined(__sun) || defined(sun) -#include -#elif (defined(_HPUX_SOURCE) || defined(__hpux) || defined(__HP_aCC)) && \ - (defined(HP_IA64) || defined(__ia64)) -#include -#elif defined(__IBMC__) && defined(__powerpc) -#include -#elif defined(_AIX) -#include -#include -#elif (defined(__osf__) && defined(__DECC)) || defined(__alpha) -#include -#include -#elif defined(__MWERKS__) -/* CodeWarrior - troubles ? */ -#pragma gcc_extensions -#elif defined(__SNC__) -/* Sony PS3 - troubles ? */ -#elif defined(__hppa__) || defined(__hppa) -#include -#else -#error Unsupported C compiler, please use GNU C 4.4 or newer -#endif /* Compiler */ - std::string format(const char *fmt, ...) { va_list ap, ones; va_start(ap, fmt); diff --git a/test/utils.h b/test/utils.h index c44f0ee4..5d62909f 100644 --- a/test/utils.h +++ b/test/utils.h @@ -17,33 +17,8 @@ #if !defined(__BYTE_ORDER__) || !defined(__ORDER_LITTLE_ENDIAN__) || \ !defined(__ORDER_BIG_ENDIAN__) -#ifndef _MSC_VER -#include /* for endianness */ -#endif -#if defined(__BYTE_ORDER) && defined(__LITTLE_ENDIAN) && defined(__BIG_ENDIAN) -#define __ORDER_LITTLE_ENDIAN__ __LITTLE_ENDIAN -#define __ORDER_BIG_ENDIAN__ __BIG_ENDIAN -#define __BYTE_ORDER__ __BYTE_ORDER -#else -#define __ORDER_LITTLE_ENDIAN__ 1234 -#define __ORDER_BIG_ENDIAN__ 4321 -#if defined(__LITTLE_ENDIAN__) || defined(_LITTLE_ENDIAN) || \ - defined(__ARMEL__) || defined(__THUMBEL__) || defined(__AARCH64EL__) || \ - defined(__MIPSEL__) || defined(_MIPSEL) || defined(__MIPSEL) || \ - defined(__i386) || defined(__x86_64__) || defined(_M_IX86) || \ - defined(_M_X64) || defined(i386) || defined(_X86_) || defined(__i386__) || \ - defined(_X86_64_) || defined(_M_ARM) || defined(_M_ARM64) || \ - defined(__e2k__) -#define __BYTE_ORDER__ __ORDER_LITTLE_ENDIAN__ -#elif defined(__BIG_ENDIAN__) || defined(_BIG_ENDIAN) || defined(__ARMEB__) || \ - defined(__THUMBEB__) || defined(__AARCH64EB__) || defined(__MIPSEB__) || \ - defined(_MIPSEB) || defined(__MIPSEB) || defined(_M_IA64) -#define __BYTE_ORDER__ __ORDER_BIG_ENDIAN__ -#else #error __BYTE_ORDER__ should be defined. #endif -#endif -#endif #if __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__ && \ __BYTE_ORDER__ != __ORDER_BIG_ENDIAN__