From 4a5b0b1e673fb225820c03505fc0053fbdd9a62b Mon Sep 17 00:00:00 2001
From: nishi <nishi@d27a3e52-49c5-7645-884c-6793ebffc270>
Date: Thu, 15 Feb 2024 07:30:45 +0000
Subject: [PATCH] fixing the warnings

git-svn-id: file:///raid/svn-main/nishi-libw3/trunk@229 d27a3e52-49c5-7645-884c-6793ebffc270
---
 Example/w3b/w3b.c | 2 ++
 Library/DNS.c     | 2 +-
 Library/FTP.c     | 4 +++-
 Library/HTTP.c    | 2 ++
 Library/NNTP.c    | 2 ++
 Library/POP3.c    | 2 ++
 Library/Tag.c     | 2 ++
 Library/Util.c    | 2 +-
 W3Version.h.m4    | 2 +-
 9 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/Example/w3b/w3b.c b/Example/w3b/w3b.c
index 8775954..bfeb493 100644
--- a/Example/w3b/w3b.c
+++ b/Example/w3b/w3b.c
@@ -32,7 +32,9 @@ HANDLE winstdout;
 char* allurl = NULL;
 int termw, termh;
 
+#ifndef __MINGW32__
 extern int strcasecmp(const char* s1, const char* s2);
+#endif
 
 void clear_console() {
 #ifdef __MINGW32__
diff --git a/Library/DNS.c b/Library/DNS.c
index 8c24b52..5812f65 100644
--- a/Library/DNS.c
+++ b/Library/DNS.c
@@ -7,8 +7,8 @@
 #include <string.h>
 
 #ifdef __MINGW32__
-#include <windows.h>
 #include <winsock2.h>
+#include <windows.h>
 #include <ws2def.h>
 #include <ws2tcpip.h>
 #else
diff --git a/Library/FTP.c b/Library/FTP.c
index ee88c90..9d01f9b 100644
--- a/Library/FTP.c
+++ b/Library/FTP.c
@@ -9,8 +9,8 @@
 #include <string.h>
 
 #ifdef __MINGW32__
-#include <windows.h>
 #include <winsock2.h>
+#include <windows.h>
 #else
 #include <netdb.h>
 #include <netinet/in.h>
@@ -18,7 +18,9 @@
 #include <sys/utsname.h>
 #endif
 
+#ifndef __MINGW32__
 extern int strcasecmp(const char* s1, const char* s2);
+#endif
 
 void __W3_FTP_Start_Passive(struct W3* w3) { __W3_Auto_Write(w3, "PASV\r\n", 6); }
 
diff --git a/Library/HTTP.c b/Library/HTTP.c
index ea08cc7..d4a68e3 100644
--- a/Library/HTTP.c
+++ b/Library/HTTP.c
@@ -12,7 +12,9 @@
 #include <string.h>
 #include <strings.h>
 
+#ifndef __MINGW32__
 extern int strcasecmp(const char* s1, const char* s2);
+#endif
 
 void __W3_HTTP_Request(struct W3* w3) {
 	__W3_Debug("LibW3-HTTP", "Sending the request");
diff --git a/Library/NNTP.c b/Library/NNTP.c
index 8eb184f..5ca216b 100644
--- a/Library/NNTP.c
+++ b/Library/NNTP.c
@@ -8,7 +8,9 @@
 #include <stdlib.h>
 #include <string.h>
 
+#ifndef __MINGW32__
 extern int strcasecmp(const char* s1, const char* s2);
+#endif
 
 void __W3_NNTP_Request(struct W3* w3) {
 	__W3_Debug("LibW3-NNTP", "Sending the request");
diff --git a/Library/POP3.c b/Library/POP3.c
index 895927c..47b98a2 100644
--- a/Library/POP3.c
+++ b/Library/POP3.c
@@ -8,7 +8,9 @@
 #include <stdlib.h>
 #include <string.h>
 
+#ifndef __MINGW32__
 extern int strcasecmp(const char* s1, const char* s2);
+#endif
 
 void __W3_POP3_Request(struct W3* w3) {
 	if(__W3_Get_Prop(w3, "POP3_USERNAME") == NULL || __W3_Get_Prop(w3, "POP3_PASSWORD") == NULL) {
diff --git a/Library/Tag.c b/Library/Tag.c
index 840ef9a..559f8e8 100644
--- a/Library/Tag.c
+++ b/Library/Tag.c
@@ -8,7 +8,9 @@
 #include <stdlib.h>
 #include <string.h>
 
+#ifndef __MINGW32__
 extern int strcasecmp(const char* s1, const char* s2);
+#endif
 
 void W3_Tag_Parse(char* data, size_t size, void (*tagfunc)(char* tagname, char* attr), void (*textfunc)(char* data)) {
 	int i;
diff --git a/Library/Util.c b/Library/Util.c
index 75360e1..7cd8c3b 100644
--- a/Library/Util.c
+++ b/Library/Util.c
@@ -9,8 +9,8 @@
 #include <string.h>
 
 #ifdef __MINGW32__
-#include <windows.h>
 #include <winsock2.h>
+#include <windows.h>
 #else
 #include <netdb.h>
 #include <netinet/in.h>
diff --git a/W3Version.h.m4 b/W3Version.h.m4
index cdc2801..295bcce 100644
--- a/W3Version.h.m4
+++ b/W3Version.h.m4
@@ -6,7 +6,7 @@
 extern "C" {
 #endif
 
-#define LIBW3_VERSION "2.15" \
+#define LIBW3_VERSION "2.15A" \
 SUFFIX
 
 ifdef(`HTTP_SUPPORT', `#define LIBW3_HTTP_SUPPORT', `')
-- 
2.43.0