Browse Source

Merge pull request #4 from kurisaW/ver-adapt

add version adapt
guo 6 tháng trước cách đây
mục cha
commit
37f1c491b5
2 tập tin đã thay đổi với 9 bổ sung1 xóa
  1. 1 1
      tcpserver.c
  2. 8 0
      tcpserver.h

+ 1 - 1
tcpserver.c

@@ -377,7 +377,7 @@ rt_err_t tcpserver_destroy(struct tcpserver *server)
 
     /* wait for the select thread to exit */
     server->state = TCPSERVER_STATE_STOP;
-    while (server->thread->stat != RT_THREAD_CLOSE)
+    while (server_thread_stat != RT_THREAD_CLOSE)
     {
         rt_thread_mdelay(100);
     }

+ 8 - 0
tcpserver.h

@@ -18,6 +18,14 @@
 #include <sys/select.h>
 #include <sys/time.h>
 
+#if defined(RT_VERSION_CHECK)
+    #if (RTTHREAD_VERSION >= RT_VERSION_CHECK(5, 1, 0))
+        #define server_thread_stat   RT_SCHED_CTX(server->thread).stat
+    #else
+        #define server_thread_stat   server->thread->stat
+    #endif
+#endif
+
 /* configurable options */
 #ifndef PKG_USING_TCPSERVER
 #define TCPSERVER_NAME         "tcpserv"