diff options
author | John Ericson <git@JohnEricson.me> | 2019-07-10 11:54:47 -0400 |
---|---|---|
committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-07-14 01:21:48 -0400 |
commit | d7c6c4717cdf1b7bd8550e37da66c52275c802f0 (patch) | |
tree | 7488a774c7b8e288b4373bcdc9121b53ba1492ea /rts/xxhash.h | |
parent | bd9fc1b2adea718be089b8370d2e82ea55af6539 (diff) | |
download | haskell-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/xxhash.h')
-rw-r--r-- | rts/xxhash.h | 22 |
1 files changed, 11 insertions, 11 deletions
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 |