X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=libserialport_internal.h;fp=libserialport_internal.h;h=20b3505925a0d8e79d00ae21f641f1a0ac429f32;hb=e919e2efaae2d5f41f56c568ceced843d24996d1;hp=1cb477c55387df0e1e9bf123fd1c5e6db6725625;hpb=a20ed2965bb4921215d3657546f5a09bfd57115e;p=libserialport.git

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>