- Fix some redefinition warnings caused by our headers' suckyness

svn path=/trunk/; revision=43041

diff --git a/rosapps/applications/net/ncftp/libncftp/syshdrs.h b/rosapps/applications/net/ncftp/libncftp/syshdrs.h
index 302240d..344db2e 100644 (file)
--- a/rosapps/applications/net/ncftp/libncftp/syshdrs.h
+++ b/rosapps/applications/net/ncftp/libncftp/syshdrs.h
@@ -31,7 +31,9 @@
 #      include <sys/types.h>
 #      include <sys/stat.h>
 #      include <fcntl.h>
 #      include <sys/types.h>
 #      include <sys/stat.h>
 #      include <fcntl.h>

+#      undef strcasecmp

 #      define strcasecmp stricmp
 #      define strcasecmp stricmp

+#      undef strncasecmp

 #      define strncasecmp strnicmp
 #      define sleep WinSleep
 #      ifndef S_ISREG
 #      define strncasecmp strnicmp
 #      define sleep WinSleep
 #      ifndef S_ISREG

diff --git a/rosapps/applications/net/ncftp/ncftp/syshdrs.h b/rosapps/applications/net/ncftp/ncftp/syshdrs.h
index 618eaf6..3a4d639 100644 (file)
--- a/rosapps/applications/net/ncftp/ncftp/syshdrs.h
+++ b/rosapps/applications/net/ncftp/ncftp/syshdrs.h
@@ -44,7 +44,9 @@
 #      include <fcntl.h>
 #      include <signal.h>
 #      include <assert.h>
 #      include <fcntl.h>
 #      include <signal.h>
 #      include <assert.h>

+#      undef strcasecmp

 #      define strcasecmp stricmp
 #      define strcasecmp stricmp

+#      undef strncasecmp

 #      define strncasecmp strnicmp
 #      define sleep WinSleep
 #      ifndef S_ISREG
 #      define strncasecmp strnicmp
 #      define sleep WinSleep
 #      ifndef S_ISREG

diff --git a/rosapps/applications/net/ncftp/sio/syshdrs.h b/rosapps/applications/net/ncftp/sio/syshdrs.h
index f4483d2..d9c6513 100644 (file)
--- a/rosapps/applications/net/ncftp/sio/syshdrs.h
+++ b/rosapps/applications/net/ncftp/sio/syshdrs.h
@@ -32,7 +32,9 @@
 #      include <sys/types.h>
 #      include <sys/stat.h>
 #      include <fcntl.h>
 #      include <sys/types.h>
 #      include <sys/stat.h>
 #      include <fcntl.h>

+#      undef strcasecmp

 #      define strcasecmp stricmp
 #      define strcasecmp stricmp

+#      undef strncasecmp

 #      define strncasecmp strnicmp
 #      define sleep(a) Sleep(a * 1000)
 #      ifndef S_ISREG
 #      define strncasecmp strnicmp
 #      define sleep(a) Sleep(a * 1000)
 #      ifndef S_ISREG