From 6a98471ae57a52784cf63c6a8a1d58edb340ec74 Mon Sep 17 00:00:00 2001 From: Peter Dillinger Date: Tue, 5 Sep 2023 14:44:17 -0700 Subject: [PATCH] Fix bad include (#11797) Summary: There was a `#include "port/lang.h"` situated inside an `extern "C" {` which just started causing the header to be unusuable in some contexts. This was a regression on the CircleCI job build-linux-unity-and-headers in https://github.com/facebook/rocksdb/issues/11792 The include, and another like it, now appears obsolete so removed. Pull Request resolved: https://github.com/facebook/rocksdb/pull/11797 Test Plan: local `make check-headers` and `make`, CI Reviewed By: jaykorean Differential Revision: D48976826 Pulled By: pdillinger fbshipit-source-id: 131d66969e045f2ded0f8936924ee30c9ef2655a --- util/xxhash.h | 3 --- util/xxph3.h | 4 ---- 2 files changed, 7 deletions(-) diff --git a/util/xxhash.h b/util/xxhash.h index ad49bab81..2b9c22883 100644 --- a/util/xxhash.h +++ b/util/xxhash.h @@ -11,9 +11,6 @@ #ifndef XXH_NAMESPACE #define XXH_NAMESPACE ROCKSDB_ #endif // !defined(XXH_NAMESPACE) - -// for FALLTHROUGH_INTENDED, inserted as appropriate -#include "port/lang.h" /* END RocksDB customizations */ // clang-format off diff --git a/util/xxph3.h b/util/xxph3.h index 968000c3a..2933b74db 100644 --- a/util/xxph3.h +++ b/util/xxph3.h @@ -386,10 +386,6 @@ typedef struct { #define XXPH_STATIC_LINKING_ONLY #endif -/* BEGIN RocksDB customizations */ -#include "port/lang.h" /* for FALLTHROUGH_INTENDED, inserted as appropriate */ -/* END RocksDB customizations */ - /* ************************************* * Compiler Specific Options ***************************************/ -- GitLab