mirror of
https://github.com/isar/libmdbx.git
synced 2025-01-06 19:04:12 +08:00
mdbx-tests: drop duplicate sysdep-includes.
This commit is contained in:
parent
86274513f9
commit
3d320253cd
@ -76,14 +76,6 @@
|
|||||||
#include <unordered_set>
|
#include <unordered_set>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
|
||||||
#include <intrin.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(__i386__) || defined(__x86_64__)
|
|
||||||
#include <x86intrin.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "../mdbx.h"
|
#include "../mdbx.h"
|
||||||
#include "../src/defs.h"
|
#include "../src/defs.h"
|
||||||
#include "../src/osal.h"
|
#include "../src/osal.h"
|
||||||
|
@ -18,40 +18,6 @@
|
|||||||
#include <ieee754.h>
|
#include <ieee754.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Compiler's includes for builtins/intrinsics */
|
|
||||||
#if defined(_MSC_VER) || defined(__INTEL_COMPILER)
|
|
||||||
#include <intrin.h>
|
|
||||||
#elif __GNUC_PREREQ(4, 4) || defined(__clang__)
|
|
||||||
#if defined(__ia32__) || defined(__e2k__)
|
|
||||||
#include <x86intrin.h>
|
|
||||||
#endif /* __ia32__ */
|
|
||||||
#if defined(__ia32__)
|
|
||||||
#include <cpuid.h>
|
|
||||||
#endif /* __ia32__ */
|
|
||||||
#elif defined(__SUNPRO_C) || defined(__sun) || defined(sun)
|
|
||||||
#include <mbarrier.h>
|
|
||||||
#elif (defined(_HPUX_SOURCE) || defined(__hpux) || defined(__HP_aCC)) && \
|
|
||||||
(defined(HP_IA64) || defined(__ia64))
|
|
||||||
#include <machine/sys/inline.h>
|
|
||||||
#elif defined(__IBMC__) && defined(__powerpc)
|
|
||||||
#include <atomic.h>
|
|
||||||
#elif defined(_AIX)
|
|
||||||
#include <builtins.h>
|
|
||||||
#include <sys/atomic_op.h>
|
|
||||||
#elif (defined(__osf__) && defined(__DECC)) || defined(__alpha)
|
|
||||||
#include <c_asm.h>
|
|
||||||
#include <machine/builtins.h>
|
|
||||||
#elif defined(__MWERKS__)
|
|
||||||
/* CodeWarrior - troubles ? */
|
|
||||||
#pragma gcc_extensions
|
|
||||||
#elif defined(__SNC__)
|
|
||||||
/* Sony PS3 - troubles ? */
|
|
||||||
#elif defined(__hppa__) || defined(__hppa)
|
|
||||||
#include <machine/inline.h>
|
|
||||||
#else
|
|
||||||
#error Unsupported C compiler, please use GNU C 4.4 or newer
|
|
||||||
#endif /* Compiler */
|
|
||||||
|
|
||||||
std::string format(const char *fmt, ...) {
|
std::string format(const char *fmt, ...) {
|
||||||
va_list ap, ones;
|
va_list ap, ones;
|
||||||
va_start(ap, fmt);
|
va_start(ap, fmt);
|
||||||
|
25
test/utils.h
25
test/utils.h
@ -17,33 +17,8 @@
|
|||||||
|
|
||||||
#if !defined(__BYTE_ORDER__) || !defined(__ORDER_LITTLE_ENDIAN__) || \
|
#if !defined(__BYTE_ORDER__) || !defined(__ORDER_LITTLE_ENDIAN__) || \
|
||||||
!defined(__ORDER_BIG_ENDIAN__)
|
!defined(__ORDER_BIG_ENDIAN__)
|
||||||
#ifndef _MSC_VER
|
|
||||||
#include <sys/param.h> /* 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.
|
#error __BYTE_ORDER__ should be defined.
|
||||||
#endif
|
#endif
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__ && \
|
#if __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__ && \
|
||||||
__BYTE_ORDER__ != __ORDER_BIG_ENDIAN__
|
__BYTE_ORDER__ != __ORDER_BIG_ENDIAN__
|
||||||
|
Loading…
x
Reference in New Issue
Block a user