gnokii-users
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Ladislav Michl
Subject: [PATCH 2/8] Use lower case for Win32 includes
Date: Mon, 3 Dec 2018 10:36:56 +0100
User-agent: Mutt/1.10.1 (2018-07-13)

From: Fabrizio Gennari <address@hidden>

mingw32 provides lower case names for Win32 header files, use lower
case names in #include directives.
---
 ChangeLog                     | 4 ++++
 common/devices/winbluetooth.c | 6 +++---
 include/gnokii.h.in           | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

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..d407d53d 100644
--- a/include/gnokii.h.in
+++ b/include/gnokii.h.in
@@ -31,8 +31,8 @@ extern "C" {
 #elif defined(__svr4__) || defined(__FreeBSD__) || defined(__NetBSD__) || 
defined(__OpenBSD__) || defined(__bsdi__) || defined(__MACH__)
 #  include <inttypes.h>
 #  include <sys/time.h>
-#elif defined(_MSC_VER) && defined(WIN32)
-#  include <Winsock.h> /* for struct timeval */
+#elif defined(WIN32)
+#  include <winsock.h> /* for struct timeval */
 typedef unsigned char uint8_t;
 #endif
 
-- 
2.20.0.rc1




reply via email to

[Prev in Thread] Current Thread [Next in Thread]