fixed pull conflict and socket ping test bug

2021-12-22 16:09:34 +08:00
parent ebb1321b7c f98689fc30
commit aa43d46953
9 changed files with 68 additions and 43 deletions
@@ -326,7 +326,7 @@ int gethostname_lwip(char* name, size_t len);
 *    Copyright 2017-2018 (c) Stefan Profanter, fortiss GmbH
 *    Copyright 2018 (c) Jose Cabral, fortiss GmbH
 */
-// tst by wly
+
 #define UA_ARCHITECTURE_FREERTOSLWIP 1

 #ifdef UA_ARCHITECTURE_FREERTOSLWIP