Re: [PATCH 2/8] Use lower case for Win32 includes

[Ladislav Michl]

On Mon, Dec 03, 2018 at 06:10:26PM +0300, Pawel Kot wrote:
> Hi,
> 
> On Mon, Dec 3, 2018 at 12:42 PM Ladislav Michl <address@hidden> wrote:
> > diff --git a/include/gnokii.h.in b/include/gnokii.h.in
> > index b3253455..d407d53d 100644
> > --- a/include/gnokii.h.in
> > +++ b/include/gnokii.h.in
> > @@ -31,8 +31,8 @@ extern "C" {
> [...]
> > -#elif defined(_MSC_VER) && defined(WIN32)
> [...]
> > +#elif defined(WIN32)
> 
> So this one changes behaviour and is not explained. And not sure if
> correct. Care to give an explanation?

I'll leave an explanation to the patch author and meanwhile offer
updated patch :) Change in include/gnokii.h.in is now no-op, it could
be as well left out, I kept it for consistency with other windows
include names.

---8<---

From: Fabrizio Gennari <address@hidden>
Subject: [PATCH v2] Use lower case for Win32 includes

mingw32 provides lower case names for Win32 header files, use lower
case names in #include directives.

diff --git a/ChangeLog b/ChangeLog
index d09275ce..ed6d42ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -117,6 +117,10 @@
  * build updates
     o use the native Autoconf support for cross-compilation, that
       is passing --host= to the configure script
+ * win32 updates
+    o since Linux filesystems are case-sensitive, and MinGW-W64
+      provides lower case names for Win32 header files, use lower
+      case names in #include directives
 
 0.6.31
 ======
diff --git a/common/devices/winbluetooth.c b/common/devices/winbluetooth.c
index 832a46f9..a898e2e6 100644
--- a/common/devices/winbluetooth.c
+++ b/common/devices/winbluetooth.c
@@ -12,10 +12,10 @@
 
 #ifdef HAVE_BLUETOOTH
 
-#include <Winsock2.h>
+#include <winsock2.h>
 #include <mmsystem.h>
-#include <Ws2bth.h>
-#include <BluetoothAPIs.h>
+#include <ws2bth.h>
+#include <bluetoothapis.h>
 
 #include "compat.h"
 #include "gnokii.h"
diff --git a/include/gnokii.h.in b/include/gnokii.h.in
index b3253455..b1bb0c5c 100644
--- a/include/gnokii.h.in
+++ b/include/gnokii.h.in
@@ -32,7 +32,7 @@ extern "C" {
 #  include <inttypes.h>
 #  include <sys/time.h>
 #elif defined(_MSC_VER) && defined(WIN32)
-#  include <Winsock.h> /* for struct timeval */
+#  include <winsock.h> /* for struct timeval */
 typedef unsigned char uint8_t;
 #endif