The previous version of this patch emailed a few minutes ago missed a case. Sorry about that.

Mark

From 14fbb400e7bfd95d0108a083cd8c0aadb1edd3a9 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabr...@mabrand.nl>
Date: Mon, 18 Jun 2012 13:02:03 +0200
Subject: [PATCH] fix case of winsock2.h which matters when cross-building

---
 src/Wt/Auth/HashFunction.C |    2 +-
 src/Wt/Utils.C             |    2 +-
 src/http/Configuration.C   |    4 ++--
 src/web/TimeUtil.C         |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Wt/Auth/HashFunction.C b/src/Wt/Auth/HashFunction.C
index 6d764fa..34615e0 100644
--- a/src/Wt/Auth/HashFunction.C
+++ b/src/Wt/Auth/HashFunction.C
@@ -15,7 +15,7 @@
 #ifndef WIN32
 #include <arpa/inet.h>
 #else
-#include <Winsock2.h>
+#include <winsock2.h>
 #endif
 #endif

diff --git a/src/Wt/Utils.C b/src/Wt/Utils.C
index 02cdf7d..75fca49 100644
--- a/src/Wt/Utils.C
+++ b/src/Wt/Utils.C
@@ -13,7 +13,7 @@
 #ifndef WIN32
 #include <arpa/inet.h>
 #else
-#include <Winsock2.h>
+#include <winsock2.h>
 #endif

 #include "Wt/WLogger"
diff --git a/src/http/Configuration.C b/src/http/Configuration.C
index 6312ae6..3ebf772 100644
--- a/src/http/Configuration.C
+++ b/src/http/Configuration.C
@@ -18,13 +18,13 @@
 #endif
 #ifdef WIN32
 #include <process.h> // for getpid()
-#include <Winsock2.h> // for gethostname()
+#include <winsock2.h> // for gethostname()
 #endif
 #include <iostream>
 #include <fstream>

 #ifdef __CYGWIN__
-#include <Winsock2.h> // for gethostname()
+#include <winsock2.h> // for gethostname()
 #endif

 namespace Wt {
diff --git a/src/web/TimeUtil.C b/src/web/TimeUtil.C
index fbada4a..94c2423 100644
--- a/src/web/TimeUtil.C
+++ b/src/web/TimeUtil.C
@@ -1,7 +1,7 @@
 #include "TimeUtil.h"

 #ifdef _MSC_VER
-#include "Winsock2.h"
+#include "winsock2.h"
 #pragma comment (lib, "winmm.lib")
 namespace {
 #include <windows.h>
--
1.7.10.4
>From 14fbb400e7bfd95d0108a083cd8c0aadb1edd3a9 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabr...@mabrand.nl>
Date: Mon, 18 Jun 2012 13:02:03 +0200
Subject: [PATCH] fix case of winsock2.h which matters when cross-building

---
 src/Wt/Auth/HashFunction.C |    2 +-
 src/Wt/Utils.C             |    2 +-
 src/http/Configuration.C   |    4 ++--
 src/web/TimeUtil.C         |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Wt/Auth/HashFunction.C b/src/Wt/Auth/HashFunction.C
index 6d764fa..34615e0 100644
--- a/src/Wt/Auth/HashFunction.C
+++ b/src/Wt/Auth/HashFunction.C
@@ -15,7 +15,7 @@
 #ifndef WIN32
 #include <arpa/inet.h>
 #else
-#include <Winsock2.h>
+#include <winsock2.h>
 #endif
 #endif
 
diff --git a/src/Wt/Utils.C b/src/Wt/Utils.C
index 02cdf7d..75fca49 100644
--- a/src/Wt/Utils.C
+++ b/src/Wt/Utils.C
@@ -13,7 +13,7 @@
 #ifndef WIN32
 #include <arpa/inet.h>
 #else
-#include <Winsock2.h>
+#include <winsock2.h>
 #endif
 
 #include "Wt/WLogger"
diff --git a/src/http/Configuration.C b/src/http/Configuration.C
index 6312ae6..3ebf772 100644
--- a/src/http/Configuration.C
+++ b/src/http/Configuration.C
@@ -18,13 +18,13 @@
 #endif
 #ifdef WIN32
 #include <process.h> // for getpid()
-#include <Winsock2.h> // for gethostname()
+#include <winsock2.h> // for gethostname()
 #endif
 #include <iostream>
 #include <fstream>
 
 #ifdef __CYGWIN__
-#include <Winsock2.h> // for gethostname()
+#include <winsock2.h> // for gethostname()
 #endif
 
 namespace Wt {
diff --git a/src/web/TimeUtil.C b/src/web/TimeUtil.C
index fbada4a..94c2423 100644
--- a/src/web/TimeUtil.C
+++ b/src/web/TimeUtil.C
@@ -1,7 +1,7 @@
 #include "TimeUtil.h"
 
 #ifdef _MSC_VER
-#include "Winsock2.h"
+#include "winsock2.h"
 #pragma comment (lib, "winmm.lib")
 namespace {
 #include <windows.h>
-- 
1.7.10.4

------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
witty-interest mailing list
witty-interest@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/witty-interest

Reply via email to