From c330a7dd2432bc55b719c34be9ec7d2baa2b9c51 Mon Sep 17 00:00:00 2001 From: Christopher Dykes Date: Thu, 31 Mar 2016 10:09:38 -0700 Subject: [PATCH] Update the sys/syscall.h portability header for Windows Summary: This adds Windows support to the portability header for sys/syscall.h, which was previously named portability/Syscall.h, which is inconsistent with the naming of the other headers, so it's now also been renamed to SysSyscall.h, and the one place that used it updated to reflect the new name. Reviewed By: yfeldblum Differential Revision: D2984383 fb-gh-sync-id: c0e4ce55c7bc2aa6db9b084e09d9762ba587002d fbshipit-source-id: c0e4ce55c7bc2aa6db9b084e09d9762ba587002d --- folly/Makefile.am | 2 +- folly/experimental/fibers/Fiber.cpp | 2 +- folly/portability/{Syscall.h => SysSyscall.h} | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) rename folly/portability/{Syscall.h => SysSyscall.h} (94%) diff --git a/folly/Makefile.am b/folly/Makefile.am index e421304b..4f3f4d60 100644 --- a/folly/Makefile.am +++ b/folly/Makefile.am @@ -276,10 +276,10 @@ nobase_follyinclude_HEADERS = \ portability/Memory.h \ portability/String.h \ portability/Strings.h \ - portability/Syscall.h \ portability/SysFile.h \ portability/SysMman.h \ portability/SysStat.h \ + portability/SysSyscall.h \ portability/SysTime.h \ portability/SysTypes.h \ portability/SysUio.h \ diff --git a/folly/experimental/fibers/Fiber.cpp b/folly/experimental/fibers/Fiber.cpp index 83e15cc2..de0e30b8 100644 --- a/folly/experimental/fibers/Fiber.cpp +++ b/folly/experimental/fibers/Fiber.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include namespace folly { namespace fibers { diff --git a/folly/portability/Syscall.h b/folly/portability/SysSyscall.h similarity index 94% rename from folly/portability/Syscall.h rename to folly/portability/SysSyscall.h index 05fae6e1..5d09042c 100644 --- a/folly/portability/Syscall.h +++ b/folly/portability/SysSyscall.h @@ -14,9 +14,9 @@ * limitations under the License. */ -#ifndef FOLLY_SYSCALL_H_ -#define FOLLY_SYSCALL_H_ +#pragma once +#ifndef _WIN32 #include #if defined(__APPLE__) @@ -26,5 +26,4 @@ #else #define FOLLY_SYS_gettid __NR_gettid #endif - #endif -- 2.34.1