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>
zephyrproject-rtos · Mar 22, 2022 · 39229e2 · 39229e2
1 parent a368a71
commit 39229e2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/.upstream b/.upstream
diff --git 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
@@ -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
+0 −4		lib/cpp/src/thrift/Thrift.h
+0 −4		lib/cpp/src/thrift/protocol/TProtocol.h
+0 −8		lib/cpp/src/thrift/server/TNonblockingServer.cpp
+0 −4		lib/cpp/src/thrift/transport/SocketCommon.h
+0 −8		lib/cpp/src/thrift/transport/TNonblockingServerSocket.cpp
+0 −4		lib/cpp/src/thrift/transport/TSSLSocket.cpp
+0 −8		lib/cpp/src/thrift/transport/TServerSocket.cpp
+0 −4		lib/cpp/src/thrift/transport/TServerSocket.h
+0 −8		lib/cpp/src/thrift/transport/TSocket.cpp
+0 −4		lib/cpp/src/thrift/transport/TSocketUtils.h
+0 −4		lib/cpp/test/TransportTest.cpp