From 39229e28277adc52cd00d0bb944e5f174baf1959 Mon Sep 17 00:00:00 2001
From: Christopher Friedt <chrisfriedt@gmail.com>
Date: Tue, 22 Mar 2022 12:23:44 -0400
Subject: [PATCH] zephyr: remove posix prefix on standard headers

The upstream PR is zephyrproject-rtos/zephyr#43987

Basing off of that so that we can roll-back the many changes like
the one below in `.upstream` thrift.

```
 #ifdef CONFIG_SOC_POSIX
 #include <unistd.h>
 #else
 #include <posix/unistd.h>
 #endif
```

Fixes #61

Signed-off-by: Christopher Friedt <chrisfriedt@gmail.com>
---
 .upstream                           | 2 +-
 tests/lib/thrift/hello/src/main.cpp | 6 ------
 west.yml                            | 4 +++-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/.upstream b/.upstream
index 9ae087d..d71129c 160000
--- a/.upstream
+++ b/.upstream
@@ -1 +1 @@
-Subproject commit 9ae087df932c65f8de9e0fc2d12b828b8306b234
+Subproject commit d71129cf1c2c5013fa5daf3686e6b00ebfee8361
diff --git a/tests/lib/thrift/hello/src/main.cpp b/tests/lib/thrift/hello/src/main.cpp
index 33eaafd..1402c9f 100644
--- a/tests/lib/thrift/hello/src/main.cpp
+++ b/tests/lib/thrift/hello/src/main.cpp
@@ -8,16 +8,10 @@
 #include <memory>
 #include <stdexcept>
 
-#ifdef CONFIG_SOC_POSIX
 #include <pthread.h>
 #include <unistd.h>
 #include <signal.h>
 #include <sys/socket.h>
-#else
-#include <posix/pthread.h>
-#include <posix/unistd.h>
-#include <posix/sys/socket.h>
-#endif
 
 #include "Hello.h"
 #include "HelloHandler.h"
diff --git a/west.yml b/west.yml
index 93ebbc7..78c797e 100644
--- a/west.yml
+++ b/west.yml
@@ -21,5 +21,7 @@ manifest:
       revision: master
     - name: zephyr
       remote: zephyrproject-rtos
-      revision: main
+      # Remove the need for 'posix/' prefix when including std headers
+      # https://github.com/zephyrproject-rtos/zephyr/pull/43987
+      revision: pull/43987/head
       import: true