Reorder platform-specific #include directives after the others This keeps includes together when they are cleaned up. PiperOrigin-RevId: 969946987 Change-Id: I1913a8d42103f4a3c28f5b41f38d5bb6f8774762
diff --git a/absl/base/internal/low_level_alloc_test.cc b/absl/base/internal/low_level_alloc_test.cc index 8fdec09..3282076 100644 --- a/absl/base/internal/low_level_alloc_test.cc +++ b/absl/base/internal/low_level_alloc_test.cc
@@ -17,16 +17,17 @@ #include <stdint.h> #include <stdio.h> #include <stdlib.h> + #include <thread> // NOLINT(build/c++11) #include <unordered_map> #include <utility> +#include "absl/container/node_hash_map.h" + #ifdef __EMSCRIPTEN__ #include <emscripten.h> #endif -#include "absl/container/node_hash_map.h" - namespace absl { ABSL_NAMESPACE_BEGIN namespace base_internal {
diff --git a/absl/base/internal/raw_logging.cc b/absl/base/internal/raw_logging.cc index 8537f3e..7c39f6d 100644 --- a/absl/base/internal/raw_logging.cc +++ b/absl/base/internal/raw_logging.cc
@@ -21,16 +21,16 @@ #include <cstring> #include <string> -#ifdef __EMSCRIPTEN__ -#include <emscripten/console.h> -#endif - #include "absl/base/attributes.h" #include "absl/base/config.h" #include "absl/base/internal/atomic_hook.h" #include "absl/base/internal/errno_saver.h" #include "absl/base/log_severity.h" +#ifdef __EMSCRIPTEN__ +#include <emscripten/console.h> +#endif + // We know how to perform low-level writes to stderr in POSIX and Windows. For // these platforms, we define the token ABSL_LOW_LEVEL_WRITE_SUPPORTED. // Much of raw_logging.cc becomes a no-op when we can't output messages,
diff --git a/absl/base/internal/scoped_set_env.cc b/absl/base/internal/scoped_set_env.cc index 8a934cb..b13e7a2 100644 --- a/absl/base/internal/scoped_set_env.cc +++ b/absl/base/internal/scoped_set_env.cc
@@ -14,14 +14,14 @@ #include "absl/base/internal/scoped_set_env.h" -#ifdef _WIN32 -#include <windows.h> -#endif - #include <cstdlib> #include "absl/base/internal/raw_logging.h" +#ifdef _WIN32 +#include <windows.h> +#endif + namespace absl { ABSL_NAMESPACE_BEGIN namespace base_internal {
diff --git a/absl/base/internal/scoped_set_env_test.cc b/absl/base/internal/scoped_set_env_test.cc index 5cbad24..6a543f0 100644 --- a/absl/base/internal/scoped_set_env_test.cc +++ b/absl/base/internal/scoped_set_env_test.cc
@@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include "gtest/gtest.h" +#include "absl/base/internal/scoped_set_env.h" + #ifdef _WIN32 #include <windows.h> #endif -#include "gtest/gtest.h" -#include "absl/base/internal/scoped_set_env.h" - namespace { using absl::base_internal::ScopedSetEnv;
diff --git a/absl/base/internal/sysinfo.cc b/absl/base/internal/sysinfo.cc index b103f49..1f380bc 100644 --- a/absl/base/internal/sysinfo.cc +++ b/absl/base/internal/sysinfo.cc
@@ -14,7 +14,26 @@ #include "absl/base/internal/sysinfo.h" +#include <string.h> + +#include <cassert> +#include <cerrno> +#include <cstdint> +#include <cstdio> +#include <cstdlib> +#include <ctime> +#include <limits> +#include <thread> // NOLINT(build/c++11) +#include <utility> +#include <vector> + #include "absl/base/attributes.h" +#include "absl/base/call_once.h" +#include "absl/base/config.h" +#include "absl/base/internal/raw_logging.h" +#include "absl/base/internal/spinlock.h" +#include "absl/base/internal/unscaledcycleclock.h" +#include "absl/base/thread_annotations.h" #ifdef _WIN32 #include <windows.h> @@ -50,26 +69,6 @@ #include <zircon/process.h> #endif -#include <string.h> - -#include <cassert> -#include <cerrno> -#include <cstdint> -#include <cstdio> -#include <cstdlib> -#include <ctime> -#include <limits> -#include <thread> // NOLINT(build/c++11) -#include <utility> -#include <vector> - -#include "absl/base/call_once.h" -#include "absl/base/config.h" -#include "absl/base/internal/raw_logging.h" -#include "absl/base/internal/spinlock.h" -#include "absl/base/internal/unscaledcycleclock.h" -#include "absl/base/thread_annotations.h" - namespace absl { ABSL_NAMESPACE_BEGIN namespace base_internal {
diff --git a/absl/base/internal/sysinfo.h b/absl/base/internal/sysinfo.h index 119cf1f..94df348 100644 --- a/absl/base/internal/sysinfo.h +++ b/absl/base/internal/sysinfo.h
@@ -24,15 +24,15 @@ #ifndef ABSL_BASE_INTERNAL_SYSINFO_H_ #define ABSL_BASE_INTERNAL_SYSINFO_H_ -#ifndef _WIN32 -#include <sys/types.h> -#endif - #include <cstdint> #include "absl/base/config.h" #include "absl/base/port.h" +#ifndef _WIN32 +#include <sys/types.h> +#endif + namespace absl { ABSL_NAMESPACE_BEGIN namespace base_internal {
diff --git a/absl/base/internal/sysinfo_test.cc b/absl/base/internal/sysinfo_test.cc index b4c75f5..7248fde 100644 --- a/absl/base/internal/sysinfo_test.cc +++ b/absl/base/internal/sysinfo_test.cc
@@ -14,11 +14,6 @@ #include "absl/base/internal/sysinfo.h" -#ifndef _WIN32 -#include <sys/types.h> -#include <unistd.h> -#endif - #include <thread> // NOLINT(build/c++11) #include <unordered_set> #include <vector> @@ -27,6 +22,11 @@ #include "absl/synchronization/barrier.h" #include "absl/synchronization/mutex.h" +#ifndef _WIN32 +#include <sys/types.h> +#include <unistd.h> +#endif + namespace absl { ABSL_NAMESPACE_BEGIN namespace base_internal {
diff --git a/absl/base/internal/thread_identity.cc b/absl/base/internal/thread_identity.cc index 0471a25..27b5816 100644 --- a/absl/base/internal/thread_identity.cc +++ b/absl/base/internal/thread_identity.cc
@@ -14,15 +14,6 @@ #include "absl/base/internal/thread_identity.h" -#if !defined(_WIN32) || defined(__MINGW32__) -#include <pthread.h> -#ifndef __wasi__ -// WASI does not provide this header, either way we disable use -// of signals with it below. -#include <signal.h> -#endif -#endif - #include <atomic> #include <cassert> #include <memory> @@ -32,6 +23,15 @@ #include "absl/base/internal/raw_logging.h" #include "absl/base/internal/spinlock.h" +#if !defined(_WIN32) || defined(__MINGW32__) +#include <pthread.h> +#ifndef __wasi__ +// WASI does not provide this header, either way we disable use +// of signals with it below. +#include <signal.h> +#endif +#endif + namespace absl { ABSL_NAMESPACE_BEGIN namespace base_internal {
diff --git a/absl/base/internal/thread_identity.h b/absl/base/internal/thread_identity.h index 0c2d619..b52c86f 100644 --- a/absl/base/internal/thread_identity.h +++ b/absl/base/internal/thread_identity.h
@@ -20,13 +20,6 @@ #ifndef ABSL_BASE_INTERNAL_THREAD_IDENTITY_H_ #define ABSL_BASE_INTERNAL_THREAD_IDENTITY_H_ -#ifndef _WIN32 -#include <pthread.h> -// Defines __GOOGLE_GRTE_VERSION__ (via glibc-specific features.h) when -// supported. -#include <unistd.h> -#endif - #include <atomic> #include <cstdint> @@ -34,6 +27,13 @@ #include "absl/base/internal/per_thread_tls.h" #include "absl/base/optimization.h" +#ifndef _WIN32 +#include <pthread.h> +// Defines __GOOGLE_GRTE_VERSION__ (via glibc-specific features.h) when +// supported. +#include <unistd.h> +#endif + namespace absl { ABSL_NAMESPACE_BEGIN
diff --git a/absl/base/internal/unscaledcycleclock.h b/absl/base/internal/unscaledcycleclock.h index fb5751b..c8a4e4b 100644 --- a/absl/base/internal/unscaledcycleclock.h +++ b/absl/base/internal/unscaledcycleclock.h
@@ -38,13 +38,13 @@ #include <cstdint> +#include "absl/base/config.h" +#include "absl/base/internal/unscaledcycleclock_config.h" + #if defined(__APPLE__) #include <TargetConditionals.h> #endif -#include "absl/base/config.h" -#include "absl/base/internal/unscaledcycleclock_config.h" - #if ABSL_USE_UNSCALED_CYCLECLOCK namespace gloop_do_not_use {