From e156f79f53d9cfbe238fdb4813609bfb5141c114 Mon Sep 17 00:00:00 2001
From: Tim Schumacher <timschumi@gmx.de>
Date: Fri, 15 Jul 2022 13:57:52 +0200
Subject: [PATCH] Everywhere: Refer to `pthread.h` by its non-prefixed name

This removes a bit of noise from the following patches, where we will
move the `pthread.h` header out of the `LibPthread` directory.
---
 Tests/Kernel/kill-pidtid-confusion.cpp         | 2 +-
 Tests/LibPthread/TestLibPthreadCleanup.cpp     | 2 +-
 Tests/LibPthread/TestLibPthreadRWLocks.cpp     | 2 +-
 Tests/LibPthread/TestLibPthreadSpinLocks.cpp   | 2 +-
 Userland/Libraries/LibC/bits/pthread_forward.h | 2 +-
 Userland/Libraries/LibC/pthread_tls.cpp        | 2 +-
 Userland/Libraries/LibC/stdlib.cpp             | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Tests/Kernel/kill-pidtid-confusion.cpp b/Tests/Kernel/kill-pidtid-confusion.cpp
index be50df5797..5d31929d40 100644
--- a/Tests/Kernel/kill-pidtid-confusion.cpp
+++ b/Tests/Kernel/kill-pidtid-confusion.cpp
@@ -6,7 +6,7 @@
 
 #include <AK/Assertions.h>
 #include <AK/Format.h>
-#include <LibPthread/pthread.h>
+#include <pthread.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/Tests/LibPthread/TestLibPthreadCleanup.cpp b/Tests/LibPthread/TestLibPthreadCleanup.cpp
index 7249ac913f..dc3378cb54 100644
--- a/Tests/LibPthread/TestLibPthreadCleanup.cpp
+++ b/Tests/LibPthread/TestLibPthreadCleanup.cpp
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <LibPthread/pthread.h>
 #include <LibTest/TestCase.h>
+#include <pthread.h>
 
 static size_t exit_count = 0;
 
diff --git a/Tests/LibPthread/TestLibPthreadRWLocks.cpp b/Tests/LibPthread/TestLibPthreadRWLocks.cpp
index 8c48aaa556..720227ab7d 100644
--- a/Tests/LibPthread/TestLibPthreadRWLocks.cpp
+++ b/Tests/LibPthread/TestLibPthreadRWLocks.cpp
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <LibPthread/pthread.h>
 #include <LibTest/TestCase.h>
+#include <pthread.h>
 
 TEST_CASE(rwlock_init)
 {
diff --git a/Tests/LibPthread/TestLibPthreadSpinLocks.cpp b/Tests/LibPthread/TestLibPthreadSpinLocks.cpp
index 57513fb051..8db74ac3b7 100644
--- a/Tests/LibPthread/TestLibPthreadSpinLocks.cpp
+++ b/Tests/LibPthread/TestLibPthreadSpinLocks.cpp
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <LibPthread/pthread.h>
 #include <LibTest/TestCase.h>
 #include <errno.h>
+#include <pthread.h>
 #include <unistd.h>
 
 TEST_CASE(spin_init_process_scope)
diff --git a/Userland/Libraries/LibC/bits/pthread_forward.h b/Userland/Libraries/LibC/bits/pthread_forward.h
index 3480383db2..849220a967 100644
--- a/Userland/Libraries/LibC/bits/pthread_forward.h
+++ b/Userland/Libraries/LibC/bits/pthread_forward.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <LibPthread/pthread.h>
+#include <pthread.h>
 
 struct PthreadFunctions {
     int (*pthread_mutex_trylock)(pthread_mutex_t* mutex);
diff --git a/Userland/Libraries/LibC/pthread_tls.cpp b/Userland/Libraries/LibC/pthread_tls.cpp
index abae74b75d..c0e0516c87 100644
--- a/Userland/Libraries/LibC/pthread_tls.cpp
+++ b/Userland/Libraries/LibC/pthread_tls.cpp
@@ -5,8 +5,8 @@
  */
 
 #include <AK/Atomic.h>
-#include <LibPthread/pthread.h>
 #include <errno.h>
+#include <pthread.h>
 #include <unistd.h>
 
 #ifndef _DYNAMIC_LOADER
diff --git a/Userland/Libraries/LibC/stdlib.cpp b/Userland/Libraries/LibC/stdlib.cpp
index bf792f99ea..69ea92f790 100644
--- a/Userland/Libraries/LibC/stdlib.cpp
+++ b/Userland/Libraries/LibC/stdlib.cpp
@@ -12,12 +12,12 @@
 #include <AK/Types.h>
 #include <AK/Utf8View.h>
 #include <LibELF/AuxiliaryVector.h>
-#include <LibPthread/pthread.h>
 #include <alloca.h>
 #include <assert.h>
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <pthread.h>
 #include <signal.h>
 #include <spawn.h>
 #include <stdio.h>