summaryrefslogtreecommitdiff
path: root/rts
diff options
context:
space:
mode:
authorJohn Ericson <git@JohnEricson.me>2019-07-10 11:54:47 -0400
committerMarge Bot <ben+marge-bot@smart-cactus.org>2019-07-14 01:21:48 -0400
commitd7c6c4717cdf1b7bd8550e37da66c52275c802f0 (patch)
tree7488a774c7b8e288b4373bcdc9121b53ba1492ea /rts
parentbd9fc1b2adea718be089b8370d2e82ea55af6539 (diff)
downloadhaskell-d7c6c4717cdf1b7bd8550e37da66c52275c802f0.tar.gz
Expunge #ifdef and #ifndef from the codebase
These are unexploded minds as far as the linter is concerned. I don't want to hit in my MRs by mistake! I did this with `sed`, and then rolled back some changes in the docs, config.guess, and the linter itself.
Diffstat (limited to 'rts')
-rw-r--r--rts/Capability.c6
-rw-r--r--rts/Capability.h2
-rw-r--r--rts/Hash.c2
-rw-r--r--rts/LinkerInternals.h2
-rw-r--r--rts/RtsMessages.c2
-rw-r--r--rts/RtsSymbols.c2
-rw-r--r--rts/StgCRunAsm.S2
-rw-r--r--rts/Ticky.c2
-rw-r--r--rts/Trace.c2
-rw-r--r--rts/linker/ELFRelocs/AArch64.def2
-rw-r--r--rts/linker/ELFRelocs/ARM.def2
-rw-r--r--rts/linker/ELFRelocs/i386.def2
-rw-r--r--rts/linker/ELFRelocs/x86_64.def2
-rw-r--r--rts/linker/Elf.c4
-rw-r--r--rts/linker/ElfTypes.h2
-rw-r--r--rts/linker/elf_compat.h2
-rw-r--r--rts/linker/elf_util.h2
-rw-r--r--rts/linker/util.h2
-rw-r--r--rts/package.conf.in2
-rw-r--r--rts/posix/OSMem.c6
-rw-r--r--rts/posix/Select.c4
-rw-r--r--rts/win32/ConsoleHandler.c6
-rw-r--r--rts/xxhash.c32
-rw-r--r--rts/xxhash.h22
24 files changed, 57 insertions, 57 deletions
diff --git a/rts/Capability.c b/rts/Capability.c
index bda3b0e681..33a94398cd 100644
--- a/rts/Capability.c
+++ b/rts/Capability.c
@@ -842,7 +842,7 @@ void waitForCapability (Capability **pCap, Task *task)
*
* ------------------------------------------------------------------------- */
-#if defined (THREADED_RTS)
+#if defined(THREADED_RTS)
/* See Note [GC livelock] in Schedule.c for why we have gcAllowed
and return the bool */
@@ -948,7 +948,7 @@ yieldCapability (Capability** pCap, Task *task, bool gcAllowed)
* get every Capability into the GC.
* ------------------------------------------------------------------------- */
-#if defined (THREADED_RTS)
+#if defined(THREADED_RTS)
void
prodCapability (Capability *cap, Task *task)
@@ -970,7 +970,7 @@ prodCapability (Capability *cap, Task *task)
*
* ------------------------------------------------------------------------- */
-#if defined (THREADED_RTS)
+#if defined(THREADED_RTS)
bool
tryGrabCapability (Capability *cap, Task *task)
diff --git a/rts/Capability.h b/rts/Capability.h
index dc1c6c2073..2a5f127793 100644
--- a/rts/Capability.h
+++ b/rts/Capability.h
@@ -160,7 +160,7 @@ struct Capability_ {
} // typedef Capability is defined in RtsAPI.h
// We never want a Capability to overlap a cache line with anything
// else, so round it up to a cache line size:
-#ifndef mingw32_HOST_OS
+#if !defined(mingw32_HOST_OS)
ATTRIBUTE_ALIGNED(64)
#endif
;
diff --git a/rts/Hash.c b/rts/Hash.c
index 658187b944..2f611c9079 100644
--- a/rts/Hash.c
+++ b/rts/Hash.c
@@ -80,7 +80,7 @@ int
hashStr(const HashTable *table, StgWord w)
{
const char *key = (char*) w;
-#ifdef x86_64_HOST_ARCH
+#if defined(x86_64_HOST_ARCH)
StgWord h = XXH64 (key, strlen(key), 1048583);
#else
StgWord h = XXH32 (key, strlen(key), 1048583);
diff --git a/rts/LinkerInternals.h b/rts/LinkerInternals.h
index 75871a5f98..9bdd7530d5 100644
--- a/rts/LinkerInternals.h
+++ b/rts/LinkerInternals.h
@@ -361,7 +361,7 @@ void freeSegments(ObjectCode *oc);
|| defined(openbsd_HOST_OS) || defined(gnu_HOST_OS)
# define OBJFORMAT_ELF
# include "linker/ElfTypes.h"
-#elif defined (mingw32_HOST_OS)
+#elif defined(mingw32_HOST_OS)
# define OBJFORMAT_PEi386
# include "linker/PEi386Types.h"
#elif defined(darwin_HOST_OS) || defined(ios_HOST_OS)
diff --git a/rts/RtsMessages.c b/rts/RtsMessages.c
index a90962e89f..6f13580e06 100644
--- a/rts/RtsMessages.c
+++ b/rts/RtsMessages.c
@@ -114,7 +114,7 @@ vdebugBelch(const char*s, va_list ap)
#define BUFSIZE 512
-#if defined (mingw32_HOST_OS)
+#if defined(mingw32_HOST_OS)
static int
isGUIApp(void)
{
diff --git a/rts/RtsSymbols.c b/rts/RtsSymbols.c
index 7f62643d3c..e34fcf03f5 100644
--- a/rts/RtsSymbols.c
+++ b/rts/RtsSymbols.c
@@ -49,7 +49,7 @@
SymE_HasProto(libdwPoolRelease) \
SymE_HasProto(libdwPoolClear)
-#if !defined (mingw32_HOST_OS)
+#if !defined(mingw32_HOST_OS)
#define RTS_POSIX_ONLY_SYMBOLS \
SymI_HasProto(__hscore_get_saved_termios) \
SymI_HasProto(__hscore_set_saved_termios) \
diff --git a/rts/StgCRunAsm.S b/rts/StgCRunAsm.S
index 9274a445b5..1dd74d3652 100644
--- a/rts/StgCRunAsm.S
+++ b/rts/StgCRunAsm.S
@@ -2,7 +2,7 @@
#include "rts/Constants.h"
#if defined(powerpc64le_HOST_ARCH)
-# ifdef linux_HOST_OS
+# if defined(linux_HOST_OS)
# define STACK_FRAME_SIZE RESERVED_C_STACK_BYTES+304
.file "StgCRun.c"
.abiversion 2
diff --git a/rts/Ticky.c b/rts/Ticky.c
index 55df113d5d..a0611fe4c4 100644
--- a/rts/Ticky.c
+++ b/rts/Ticky.c
@@ -25,7 +25,7 @@ StgEntCounter *ticky_entry_ctrs = NULL; /* root of list of them */
/* We want Haskell code compiled with -ticky to be linkable with any
* version of the RTS, so we have to make sure all the symbols that
* ticky-compiled code may refer to are defined by every RTS. (#3439)
- * Hence the #ifdef is here, rather than up above.
+ * Hence the #if defined(is) here, rather than up above.
*/
#if defined(TICKY_TICKY)
diff --git a/rts/Trace.c b/rts/Trace.c
index e345377eef..d5c4319076 100644
--- a/rts/Trace.c
+++ b/rts/Trace.c
@@ -458,7 +458,7 @@ void traceOSProcessInfo_(void) {
CAPSET_OSPROCESS_DEFAULT,
getpid());
-#if !defined (mingw32_HOST_OS)
+#if !defined(mingw32_HOST_OS)
/* Windows has no strong concept of process hierarchy, so no getppid().
* In any case, this trace event is mainly useful for tracing programs
* that use 'forkProcess' which Windows doesn't support anyway.
diff --git a/rts/linker/ELFRelocs/AArch64.def b/rts/linker/ELFRelocs/AArch64.def
index c21df07d2d..d77b681dc6 100644
--- a/rts/linker/ELFRelocs/AArch64.def
+++ b/rts/linker/ELFRelocs/AArch64.def
@@ -1,5 +1,5 @@
-#ifndef ELF_RELOC
+#if !defined(ELF_RELOC)
#error "ELF_RELOC must be defined"
#endif
diff --git a/rts/linker/ELFRelocs/ARM.def b/rts/linker/ELFRelocs/ARM.def
index 730fc5b883..eb21e6cef6 100644
--- a/rts/linker/ELFRelocs/ARM.def
+++ b/rts/linker/ELFRelocs/ARM.def
@@ -1,5 +1,5 @@
-#ifndef ELF_RELOC
+#if !defined(ELF_RELOC)
#error "ELF_RELOC must be defined"
#endif
diff --git a/rts/linker/ELFRelocs/i386.def b/rts/linker/ELFRelocs/i386.def
index 1d28cf595c..3191195ea8 100644
--- a/rts/linker/ELFRelocs/i386.def
+++ b/rts/linker/ELFRelocs/i386.def
@@ -1,5 +1,5 @@
-#ifndef ELF_RELOC
+#if !defined(ELF_RELOC)
#error "ELF_RELOC must be defined"
#endif
diff --git a/rts/linker/ELFRelocs/x86_64.def b/rts/linker/ELFRelocs/x86_64.def
index 18fdcf9472..197931fa51 100644
--- a/rts/linker/ELFRelocs/x86_64.def
+++ b/rts/linker/ELFRelocs/x86_64.def
@@ -1,5 +1,5 @@
-#ifndef ELF_RELOC
+#if !defined(ELF_RELOC)
#error "ELF_RELOC must be defined"
#endif
diff --git a/rts/linker/Elf.c b/rts/linker/Elf.c
index 954993f086..0882f8d349 100644
--- a/rts/linker/Elf.c
+++ b/rts/linker/Elf.c
@@ -1122,13 +1122,13 @@ do_Elf_Rel_relocations ( ObjectCode* oc, char* ehdrC,
#endif
switch (reloc_type) {
-# ifdef i386_HOST_ARCH
+# if defined(i386_HOST_ARCH)
case COMPAT_R_386_NONE: break;
case COMPAT_R_386_32: *pP = value; break;
case COMPAT_R_386_PC32: *pP = value - P; break;
# endif
-# ifdef arm_HOST_ARCH
+# if defined(arm_HOST_ARCH)
case COMPAT_R_ARM_ABS32: /* (S + A) | T */
// Specified by Linux ARM ABI to be equivalent to ABS32
case COMPAT_R_ARM_TARGET1:
diff --git a/rts/linker/ElfTypes.h b/rts/linker/ElfTypes.h
index 852d82a498..e5333d71a7 100644
--- a/rts/linker/ElfTypes.h
+++ b/rts/linker/ElfTypes.h
@@ -1,4 +1,4 @@
-#ifndef ElfTypes_h
+#if !defined(ElfTypes_h)
#define ElfTypes_h
#if defined(OBJFORMAT_ELF)
diff --git a/rts/linker/elf_compat.h b/rts/linker/elf_compat.h
index c42f1f8949..b409728a09 100644
--- a/rts/linker/elf_compat.h
+++ b/rts/linker/elf_compat.h
@@ -9,7 +9,7 @@
// under which it is distrubuted.
//
-#ifndef RTS_ELF_COMPAT_H
+#if !defined(RTS_ELF_COMPAT_H)
#define RTS_ELF_COMPAT_H
#define PASTE(x,y) x ## y
diff --git a/rts/linker/elf_util.h b/rts/linker/elf_util.h
index d94eb6992e..2ece198268 100644
--- a/rts/linker/elf_util.h
+++ b/rts/linker/elf_util.h
@@ -1,4 +1,4 @@
-#ifndef RTS_LINKER_ELF_UTIL_H
+#if !defined(RTS_LINKER_ELF_UTIL_H)
#define RTS_LINKER_ELF_UTIL_H
#include "LinkerInternals.h"
diff --git a/rts/linker/util.h b/rts/linker/util.h
index f2aa50649d..77f06978ab 100644
--- a/rts/linker/util.h
+++ b/rts/linker/util.h
@@ -1,4 +1,4 @@
-#ifndef RTS_LINKER_UTIL_H
+#if !defined(RTS_LINKER_UTIL_H)
#define RTS_LINKER_UTIL_H
#include <stdint.h>
diff --git a/rts/package.conf.in b/rts/package.conf.in
index dc44b74ac1..a0e124a061 100644
--- a/rts/package.conf.in
+++ b/rts/package.conf.in
@@ -55,7 +55,7 @@ extra-libraries:
,"bfd", "iberty" /* for debugging */
#endif
#if defined(HAVE_LIBMINGWEX)
-# ifndef INSTALLING /* Bundled Mingw is behind */
+# if !defined(INSTALLING) /* Bundled Mingw is behind */
,"mingwex"
# endif
#endif
diff --git a/rts/posix/OSMem.c b/rts/posix/OSMem.c
index cf4b705d74..dc8c4122f7 100644
--- a/rts/posix/OSMem.c
+++ b/rts/posix/OSMem.c
@@ -49,17 +49,17 @@
#include <sys/sysctl.h>
#endif
-#ifndef MAP_FAILED
+#if !defined(MAP_FAILED)
# define MAP_FAILED ((void *)-1)
#endif
#if defined(hpux_HOST_OS)
-# ifndef MAP_ANON
+# if !defined(MAP_ANON)
# define MAP_ANON MAP_ANONYMOUS
# endif
#endif
-#ifndef darwin_HOST_OS
+#if !defined(darwin_HOST_OS)
# undef RESERVE_FLAGS
# if defined(MAP_GUARD)
# define RESERVE_FLAGS MAP_GUARD /* FreeBSD */
diff --git a/rts/posix/Select.c b/rts/posix/Select.c
index 211d47dbec..5b143e1bf7 100644
--- a/rts/posix/Select.c
+++ b/rts/posix/Select.c
@@ -23,11 +23,11 @@
#include "Stats.h"
#include "GetTime.h"
-# ifdef HAVE_SYS_SELECT_H
+# if defined(HAVE_SYS_SELECT_H)
# include <sys/select.h>
# endif
-# ifdef HAVE_SYS_TYPES_H
+# if defined(HAVE_SYS_TYPES_H)
# include <sys/types.h>
# endif
diff --git a/rts/win32/ConsoleHandler.c b/rts/win32/ConsoleHandler.c
index 545a76a004..3ddf4103da 100644
--- a/rts/win32/ConsoleHandler.c
+++ b/rts/win32/ConsoleHandler.c
@@ -37,7 +37,7 @@ void
initUserSignals(void)
{
console_handler = STG_SIG_DFL;
-#if !defined (THREADED_RTS)
+#if !defined(THREADED_RTS)
stg_pending_events = 0;
if (hConsoleEvent == INVALID_HANDLE_VALUE) {
hConsoleEvent =
@@ -59,7 +59,7 @@ freeSignalHandlers(void) {
void
finiUserSignals(void)
{
-#if !defined (THREADED_RTS)
+#if !defined(THREADED_RTS)
if (hConsoleEvent != INVALID_HANDLE_VALUE) {
CloseHandle(hConsoleEvent);
}
@@ -162,7 +162,7 @@ void awaitUserSignals(void)
}
-#if !defined (THREADED_RTS)
+#if !defined(THREADED_RTS)
/*
* Function: startSignalHandlers()
*
diff --git a/rts/xxhash.c b/rts/xxhash.c
index 833b99f3b2..fd63ba89dd 100644
--- a/rts/xxhash.c
+++ b/rts/xxhash.c
@@ -49,7 +49,7 @@
* See http://stackoverflow.com/a/32095106/646947 for details.
* Prefer these methods in priority order (0 > 1 > 2)
*/
-#ifndef XXH_FORCE_MEMORY_ACCESS /* can be defined externally, on command line for example */
+#if !defined(XXH_FORCE_MEMORY_ACCESS) /* can be defined externally, on command line for example */
# if defined(__GNUC__) && ( defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6T2__) )
# define XXH_FORCE_MEMORY_ACCESS 2
# elif defined(__INTEL_COMPILER) || \
@@ -73,7 +73,7 @@
* to improve speed for Big-endian CPU.
* This option has no impact on Little_Endian CPU.
*/
-#ifndef XXH_FORCE_NATIVE_FORMAT /* can be defined externally */
+#if !defined(XXH_FORCE_NATIVE_FORMAT) /* can be defined externally */
# define XXH_FORCE_NATIVE_FORMAT 0
#endif
@@ -84,7 +84,7 @@
* set it to 0 when the input is guaranteed to be aligned,
* or when alignment doesn't matter for performance.
*/
-#ifndef XXH_FORCE_ALIGN_CHECK /* can be defined externally */
+#if !defined(XXH_FORCE_ALIGN_CHECK) /* can be defined externally */
# if defined(__i386) || defined(_M_IX86) || defined(__x86_64__) || defined(_M_X64)
# define XXH_FORCE_ALIGN_CHECK 0
# else
@@ -112,12 +112,12 @@ static void* XXH_memcpy(void* dest, const void* src, size_t size) { return memcp
/* *************************************
* Compiler Specific Options
***************************************/
-#ifdef _MSC_VER /* Visual Studio */
+#if defined(_MSC_VER) /* Visual Studio */
# pragma warning(disable : 4127) /* disable: C4127: conditional expression is constant */
# define FORCE_INLINE static __forceinline
#else
-# if defined (__cplusplus) || defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L /* C99 */
-# ifdef __GNUC__
+# if defined(__cplusplus) || defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L /* C99 */
+# if defined(__GNUC__)
# define FORCE_INLINE static inline __attribute__((always_inline))
# else
# define FORCE_INLINE static inline
@@ -131,8 +131,8 @@ static void* XXH_memcpy(void* dest, const void* src, size_t size) { return memcp
/* *************************************
* Basic Types
***************************************/
-#ifndef MEM_MODULE
-# if !defined (__VMS) && (defined (__cplusplus) || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */) )
+#if !defined(MEM_MODULE)
+# if !defined(__VMS) && (defined(__cplusplus) || (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */) )
# include <stdint.h>
typedef uint8_t BYTE;
typedef uint16_t U16;
@@ -206,7 +206,7 @@ static U32 XXH_swap32 (U32 x)
typedef enum { XXH_bigEndian=0, XXH_littleEndian=1 } XXH_endianess;
/* XXH_CPU_LITTLE_ENDIAN can be defined externally, for example on the compiler command line */
-#ifndef XXH_CPU_LITTLE_ENDIAN
+#if !defined(XXH_CPU_LITTLE_ENDIAN)
static const int g_one = 1;
# define XXH_CPU_LITTLE_ENDIAN (*(const char*)(&g_one))
#endif
@@ -267,7 +267,7 @@ FORCE_INLINE U32 XXH32_endian_align(const void* input, size_t len, U32 seed, XXH
U32 h32;
#define XXH_get32bits(p) XXH_readLE32_align(p, endian, align)
-#ifdef XXH_ACCEPT_NULL_INPUT_POINTER
+#if defined(XXH_ACCEPT_NULL_INPUT_POINTER)
if (p==NULL) {
len=0;
bEnd=p=(const BYTE*)(size_t)16;
@@ -380,7 +380,7 @@ FORCE_INLINE XXH_errorcode XXH32_update_endian (XXH32_state_t* state, const void
const BYTE* p = (const BYTE*)input;
const BYTE* const bEnd = p + len;
-#ifdef XXH_ACCEPT_NULL_INPUT_POINTER
+#if defined(XXH_ACCEPT_NULL_INPUT_POINTER)
if (input==NULL) return XXH_ERROR;
#endif
@@ -513,7 +513,7 @@ XXH_PUBLIC_API XXH32_hash_t XXH32_hashFromCanonical(const XXH32_canonical_t* src
}
-#ifndef XXH_NO_LONG_LONG
+#if !defined(XXH_NO_LONG_LONG)
/* *******************************************************************
* 64-bits hash functions
@@ -521,9 +521,9 @@ XXH_PUBLIC_API XXH32_hash_t XXH32_hashFromCanonical(const XXH32_canonical_t* src
/*====== Memory access ======*/
-#ifndef MEM_MODULE
+#if !defined(MEM_MODULE)
# define MEM_MODULE
-# if !defined (__VMS) && (defined (__cplusplus) || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */) )
+# if !defined(__VMS) && (defined(__cplusplus) || (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */) )
# include <stdint.h>
typedef uint64_t U64;
# else
@@ -627,7 +627,7 @@ FORCE_INLINE U64 XXH64_endian_align(const void* input, size_t len, U64 seed, XXH
U64 h64;
#define XXH_get64bits(p) XXH_readLE64_align(p, endian, align)
-#ifdef XXH_ACCEPT_NULL_INPUT_POINTER
+#if defined(XXH_ACCEPT_NULL_INPUT_POINTER)
if (p==NULL) {
len=0;
bEnd=p=(const BYTE*)(size_t)32;
@@ -749,7 +749,7 @@ FORCE_INLINE XXH_errorcode XXH64_update_endian (XXH64_state_t* state, const void
const BYTE* p = (const BYTE*)input;
const BYTE* const bEnd = p + len;
-#ifdef XXH_ACCEPT_NULL_INPUT_POINTER
+#if defined(XXH_ACCEPT_NULL_INPUT_POINTER)
if (input==NULL) return XXH_ERROR;
#endif
diff --git a/rts/xxhash.h b/rts/xxhash.h
index 9d831e03b3..98ec9639cb 100644
--- a/rts/xxhash.h
+++ b/rts/xxhash.h
@@ -64,10 +64,10 @@ XXH64 13.8 GB/s 1.9 GB/s
XXH32 6.8 GB/s 6.0 GB/s
*/
-#ifndef XXHASH_H_5627135585666179
+#if !defined(XXHASH_H_5627135585666179)
#define XXHASH_H_5627135585666179 1
-#if defined (__cplusplus)
+#if defined(__cplusplus)
extern "C" {
#endif
@@ -91,13 +91,13 @@ typedef enum { XXH_OK=0, XXH_ERROR } XXH_errorcode;
* `xxhash.c` is automatically included.
* It's not useful to compile and link it as a separate module.
*/
-#ifdef XXH_PRIVATE_API
-# ifndef XXH_STATIC_LINKING_ONLY
+#if defined(XXH_PRIVATE_API)
+# if !defined(XXH_STATIC_LINKING_ONLY)
# define XXH_STATIC_LINKING_ONLY
# endif
# if defined(__GNUC__)
# define XXH_PUBLIC_API static __inline __attribute__((unused))
-# elif defined (__cplusplus) || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */)
+# elif defined(__cplusplus) || (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */)
# define XXH_PUBLIC_API static inline
# elif defined(_MSC_VER)
# define XXH_PUBLIC_API static __inline
@@ -119,7 +119,7 @@ with the value of XXH_NAMESPACE (therefore, avoid NULL and numeric values).
Note that no change is required within the calling program as long as it includes `xxhash.h` :
regular symbol name will be automatically translated by this header.
*/
-#ifdef XXH_NAMESPACE
+#if defined(XXH_NAMESPACE)
# define XXH_CAT(A,B) A##B
# define XXH_NAME2(A,B) XXH_CAT(A,B)
# define XXH_versionNumber XXH_NAME2(XXH_NAMESPACE, XXH_versionNumber)
@@ -211,7 +211,7 @@ XXH_PUBLIC_API XXH32_hash_t XXH32_hashFromCanonical(const XXH32_canonical_t* src
*/
-#ifndef XXH_NO_LONG_LONG
+#if !defined(XXH_NO_LONG_LONG)
/*-**********************************************************************
* 64-bits hash
************************************************************************/
@@ -241,7 +241,7 @@ XXH_PUBLIC_API XXH64_hash_t XXH64_hashFromCanonical(const XXH64_canonical_t* src
#endif /* XXH_NO_LONG_LONG */
-#ifdef XXH_STATIC_LINKING_ONLY
+#if defined(XXH_STATIC_LINKING_ONLY)
/* ================================================================================================
This section contains definitions which are not guaranteed to remain stable.
@@ -266,7 +266,7 @@ struct XXH32_state_s {
unsigned reserved; /* never read nor write, will be removed in a future version */
}; /* typedef'd to XXH32_state_t */
-#ifndef XXH_NO_LONG_LONG /* remove 64-bits support */
+#if !defined(XXH_NO_LONG_LONG) /* remove 64-bits support */
struct XXH64_state_s {
unsigned long long total_len;
unsigned long long v1;
@@ -279,14 +279,14 @@ struct XXH64_state_s {
}; /* typedef'd to XXH64_state_t */
#endif
-#ifdef XXH_PRIVATE_API
+#if defined(XXH_PRIVATE_API)
# include "xxhash.c" /* include xxhash function bodies as `static`, for inlining */
#endif
#endif /* XXH_STATIC_LINKING_ONLY */
-#if defined (__cplusplus)
+#if defined(__cplusplus)
}
#endif