From: Martin Ling <redacted>
Date: Fri, 24 Jan 2020 02:56:05 +0000 (+0000)
Subject: Adjust headers and include ordering for MSVC support.
X-Git-Tag: libserialport-0.1.2~47
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=e919e2efaae2d5f41f56c568ceced843d24996d1;p=libserialport.git

Adjust headers and include ordering for MSVC support.
---

diff --git a/libserialport_internal.h b/libserialport_internal.h
index 1cb477c..20b3505 100644
--- a/libserialport_internal.h
+++ b/libserialport_internal.h
@@ -21,7 +21,13 @@
 #ifndef LIBSERIALPORT_LIBSERIALPORT_INTERNAL_H
 #define LIBSERIALPORT_LIBSERIALPORT_INTERNAL_H
 
+/* These MSVC-specific defines must appear before other headers.*/
+#ifdef _MSC_VER
+#define _CRT_NONSTDC_NO_DEPRECATE
+#define _CRT_SECURE_NO_WARNINGS
+#endif
 
+/* These Linux/glibc specific defines must appear before other headers.*/
 #ifdef __linux__
 /* For timeradd, timersub, timercmp, realpath. */
 #define _BSD_SOURCE 1 /* for glibc < 2.19 */
@@ -30,6 +36,19 @@
 #define _POSIX_C_SOURCE 199309L
 #endif
 
+#ifdef LIBSERIALPORT_ATBUILD
+/* If building with autoconf, include the generated config.h. */
+#include <config.h>
+#endif
+
+#ifdef LIBSERIALPORT_MSBUILD
+/* If building with MS tools, define necessary things that
+   would otherwise appear in config.h. */
+#define SP_PRIV
+#endif
+
+#include "libserialport.h"
+
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/serialport.c b/serialport.c
index 30c8373..d356057 100644
--- a/serialport.c
+++ b/serialport.c
@@ -21,8 +21,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
-#include "libserialport.h"
 #include "libserialport_internal.h"
 
 static const struct std_baudrate std_baudrates[] = {
diff --git a/timing.c b/timing.c
index 957f676..8817e48 100644
--- a/timing.c
+++ b/timing.c
@@ -17,8 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
-#include "libserialport.h"
 #include "libserialport_internal.h"
 
 SP_PRIV void time_get(struct time *time)
diff --git a/windows.c b/windows.c
index 357feed..0521716 100644
--- a/windows.c
+++ b/windows.c
@@ -18,8 +18,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
-#include "libserialport.h"
 #include "libserialport_internal.h"
 
 /* USB path is a string of at most 8 decimal numbers < 128 separated by dots. */