[libc-commits] [libc] f6259d9 - [libc] Fix the remaining old style includes

[Petr Hosek via libc-commits]

Author: Petr Hosek
Date: 2023-08-29T05:35:05Z
New Revision: f6259d9b9a546dbfa5bc2f29313c6edd6c701177

URL: https://github.com/llvm/llvm-project/commit/f6259d9b9a546dbfa5bc2f29313c6edd6c701177
DIFF: https://github.com/llvm/llvm-project/commit/f6259d9b9a546dbfa5bc2f29313c6edd6c701177.diff

LOG: [libc] Fix the remaining old style includes

These were omitted from previous cleanup changes.

Differential Revision: https://reviews.llvm.org/D159066

Added: 
    

Modified: 
    libc/src/__support/threads/linux/callonce.cpp
    libc/src/signal/linux/__restore.cpp
    libc/src/threads/linux/call_once.cpp

Removed: 
    


################################################################################
diff  --git a/libc/src/__support/threads/linux/callonce.cpp b/libc/src/__support/threads/linux/callonce.cpp
index 900cda88d1f2f1..1e43037d3fe2f3 100644
--- a/libc/src/__support/threads/linux/callonce.cpp
+++ b/libc/src/__support/threads/linux/callonce.cpp
@@ -8,13 +8,13 @@
 
 #include "futex_word.h"
 
-#include "include/sys/syscall.h" // For syscall numbers.
 #include "src/__support/CPP/atomic.h"
 #include "src/__support/OSUtil/syscall.h" // For syscall functions.
 #include "src/__support/threads/callonce.h"
 
 #include <limits.h>
 #include <linux/futex.h>
+#include <sys/syscall.h> // For syscall numbers.
 
 namespace __llvm_libc {
 

diff  --git a/libc/src/signal/linux/__restore.cpp b/libc/src/signal/linux/__restore.cpp
index b7c6dccd1323b1..947373031f1578 100644
--- a/libc/src/signal/linux/__restore.cpp
+++ b/libc/src/signal/linux/__restore.cpp
@@ -10,9 +10,10 @@
 // strongly control the options this file is compiled with. __restore_rt cannot
 // make any stack allocations so we must ensure this.
 
-#include "include/sys/syscall.h"
 #include "src/__support/OSUtil/syscall.h"
 
+#include <sys/syscall.h>
+
 namespace __llvm_libc {
 
 extern "C" void __restore_rt()

diff  --git a/libc/src/threads/linux/call_once.cpp b/libc/src/threads/linux/call_once.cpp
index 6a9c819b7853b6..a3c0131ff78f18 100644
--- a/libc/src/threads/linux/call_once.cpp
+++ b/libc/src/threads/linux/call_once.cpp
@@ -8,8 +8,6 @@
 
 #include "Futex.h"
 
-#include "include/sys/syscall.h" // For syscall numbers.
-#include "include/threads.h"     // For call_once related type definition.
 #include "src/__support/CPP/atomic.h"
 #include "src/__support/OSUtil/syscall.h" // For syscall functions.
 #include "src/__support/common.h"
@@ -18,6 +16,8 @@
 
 #include <limits.h>
 #include <linux/futex.h>
+#include <sys/syscall.h> // For syscall numbers.
+#include <threads.h>     // For call_once related type definition.
 
 namespace __llvm_libc {