test

sdk/app/spook/event.h

@@ -16,7 +16,7 @@
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "lwip\sockets.h"
+#include "lwip/sockets.h"
 #include "list.h"
 #include "lib/net/eloop/eloop.h"
 

sdk/app/spook/live.c

@@ -1,8 +1,8 @@
-#include "lwip\sockets.h"
-#include "lwip\netif.h"
-#include "lwip\dns.h"
-#include "lwip\api.h"
-#include "lwip\tcp.h"
+#include "lwip/sockets.h"
+#include "lwip/netif.h"
+#include "lwip/dns.h"
+#include "lwip/api.h"
+#include "lwip/tcp.h"
 
 #include "rtsp_common.h"
 #include "osal/string.h"

sdk/app/spook/rtp-audio.c

@@ -18,12 +18,12 @@
 
 
 #include <stdio.h>
-#include "lwip\sockets.h"
-#include "lwip\netif.h"
-#include "lwip\dns.h"
+#include "lwip/sockets.h"
+#include "lwip/netif.h"
+#include "lwip/dns.h"
 
-#include "lwip\api.h"
-#include "lwip\tcp.h"
+#include "lwip/api.h"
+#include "lwip/tcp.h"
 
 #include <event.h>
 #include <log.h>

sdk/app/spook/rtp-jpeg.c

@@ -18,12 +18,12 @@
 
 
 #include <stdio.h>
-#include "lwip\sockets.h"
-#include "lwip\netif.h"
-#include "lwip\dns.h"
+#include "lwip/sockets.h"
+#include "lwip/netif.h"
+#include "lwip/dns.h"
 
-#include "lwip\api.h"
-#include "lwip\tcp.h"
+#include "lwip/api.h"
+#include "lwip/tcp.h"
 
 #include <event.h>
 #include <log.h>

sdk/app/spook/rtp.c

@@ -16,12 +16,12 @@
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 #include <stdio.h>
-#include "lwip\sockets.h"
-#include "lwip\netif.h"
-#include "lwip\dns.h"
-//#include "lwip\fcntl.h"
-#include "lwip\api.h"
-#include "lwip\tcp.h"
+#include "lwip/sockets.h"
+#include "lwip/netif.h"
+#include "lwip/dns.h"
+//#include "lwip/fcntl.h"
+#include "lwip/api.h"
+#include "lwip/tcp.h"
 
 #include <event.h>
 #include <log.h>

sdk/app/spook/rtsp.c

@@ -19,13 +19,13 @@
 
 #include <stdio.h>
 
-#include "lwip\sockets.h"
-#include "lwip\netif.h"
-#include "lwip\dns.h"
+#include "lwip/sockets.h"
+#include "lwip/netif.h"
+#include "lwip/dns.h"
 
-#include "lwip\api.h"
+#include "lwip/api.h"
 
-#include "lwip\tcp.h"
+#include "lwip/tcp.h"
 
 #include <event.h>
 #include <log.h>

sdk/app/spook/rtsp_common.c

@@ -1,9 +1,9 @@
 #include <stdio.h>
-#include "lwip\sockets.h"
-#include "lwip\netif.h"
-#include "lwip\dns.h"
-#include "lwip\api.h"
-#include "lwip\tcp.h"
+#include "lwip/sockets.h"
+#include "lwip/netif.h"
+#include "lwip/dns.h"
+#include "lwip/api.h"
+#include "lwip/tcp.h"
 #include "log.h"
 #include "sys_config.h"
 #include "osal/string.h"

sdk/app/spook/session.c

@@ -19,12 +19,12 @@
 
 #include <stdio.h>
 //#include "sys_config.h"
-#include "lwip\sockets.h"
-#include "lwip\netif.h"
-#include "lwip\dns.h"
-#include "lwip\api.h"
+#include "lwip/sockets.h"
+#include "lwip/netif.h"
+#include "lwip/dns.h"
+#include "lwip/api.h"
 
-#include "lwip\tcp.h"
+#include "lwip/tcp.h"
 
 #include <event.h>
 #include <log.h>

sdk/app/spook/spook.c

@@ -17,13 +17,13 @@
  */
 
 #include <stdio.h>
-#include "lwip\sockets.h"
-#include "lwip\netif.h"
-#include "lwip\dns.h"
+#include "lwip/sockets.h"
+#include "lwip/netif.h"
+#include "lwip/dns.h"
 
-#include "lwip\api.h"
+#include "lwip/api.h"
 
-#include "lwip\tcp.h"
+#include "lwip/tcp.h"
 
 #include <event.h>
 #include <log.h>

sdk/app/spook/tcp.c

@@ -18,11 +18,11 @@
 
 #include <stdio.h>
 
-#include "lwip\sockets.h"
-#include "lwip\netif.h"
-#include "lwip\dns.h"
-//#include "lwip\fcntl.h"
-#include "lwip\api.h"
+#include "lwip/sockets.h"
+#include "lwip/netif.h"
+#include "lwip/dns.h"
+//#include "lwip/fcntl.h"
+#include "lwip/api.h"
 
 #include "typesdef.h"
 //#include <linux/linux_mutex.h>

sdk/app/spook/webfile.c

@@ -1,8 +1,8 @@
-#include "lwip\sockets.h"
-#include "lwip\netif.h"
-#include "lwip\dns.h"
-#include "lwip\api.h"
-#include "lwip\tcp.h"
+#include "lwip/sockets.h"
+#include "lwip/netif.h"
+#include "lwip/dns.h"
+#include "lwip/api.h"
+#include "lwip/tcp.h"
 
 #include "rtsp_common.h"
 #include "osal/string.h"

sdk/app/update/ota.c

@@ -1,11 +1,11 @@
 #include <stdio.h>
 #include "tx_platform.h"
-#include "lwip\sockets.h"
-#include "lwip\netif.h"
-#include "lwip\dns.h"
-//#include "lwip\fcntl.h"
-#include "lwip\api.h"
-#include "lwip\tcp.h"
+#include "lwip/sockets.h"
+#include "lwip/netif.h"
+#include "lwip/dns.h"
+//#include "lwip/fcntl.h"
+#include "lwip/api.h"
+#include "lwip/tcp.h"
 
 #include <event.h>
 #include <log.h>

sdk/include/osal/csky/string.h

@@ -89,7 +89,10 @@ extern "C" {
 #define os_strcpy(d,s)     strcpy((char *)(d), (const char *)(s))
 #define os_strncpy(d,s,n)  strncpy((char *)(d), (const char *)(s), n)
 #define os_memset(s,c,n)   memset((void *)(s), c, n)
-#define os_memcpy(d,s,n)   memcpy((void *)(d), (const void *)(s), n)
+//#define os_memcpy(d,s,n)   memcpy((void *)(d), (const void *)(s), n)
+#define MEMCPY memcpy
+#define os_memcpy(d, s, n) MEMCPY((d), (s), (n))
+//#define os_memcpy memcpy
 #define os_memmove(d,s,n)  memmove((void *)(d), (const void *)(s), n)
 #define os_sprintf(s, ...) sprintf((char *)(s), __VA_ARGS__)
 #define os_vsnprintf       vsnprintf