Browse Source

Merge pull request #1068 from cfriedt/zephyr-time-instead-of-posix-time

zephyr: remove posix prefix on standard headers
bel2125 3 năm trước cách đây
mục cha
commit
0ce1271def
1 tập tin đã thay đổi với 9 bổ sung9 xóa
  1. 9 9
      src/civetweb.c

+ 9 - 9
src/civetweb.c

@@ -21,8 +21,10 @@
  */
 
 #if defined(__GNUC__) || defined(__MINGW32__)
+#ifndef GCC_VERSION
 #define GCC_VERSION                                                            \
 	(__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
+#endif
 #if GCC_VERSION >= 40500
 /* gcc diagnostic pragmas available */
 #define GCC_DIAGNOSTIC
@@ -182,20 +184,18 @@ mg_static_assert(sizeof(void *) >= sizeof(int), "data type size check");
 #endif /* __SYMBIAN32__ */
 
 #if defined(__ZEPHYR__)
-#include <time.h>
-
 #include <ctype.h>
-#include <net/socket.h>
-#include <posix/pthread.h>
-#include <posix/time.h>
+#include <fcntl.h>
+#include <netdb.h>
+#include <poll.h>
+#include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <zephyr.h>
-
-#include <fcntl.h>
+#include <sys/socket.h>
+#include <time.h>
 
-#include <libc_extensions.h>
+#include <zephyr.h>
 
 /* Max worker threads is the max of pthreads minus the main application thread
  * and minus the main civetweb thread, thus -2