Adjust headers and include ordering for MSVC support.

diff --git a/libserialport_internal.h b/libserialport_internal.h
index 1cb477c55387df0e1e9bf123fd1c5e6db6725625..20b3505925a0d8e79d00ae21f641f1a0ac429f32 100644 (file)
--- 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 30c83739a360f63031c50ba3357eb2f0a6abe668..d356057525c3e56a6afe5aefaccd28374552468f 100644 (file)
--- 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 957f676e160f551f62c9051fc344f76abe33b52e..8817e485fd0ea1f212e3625a3f1ca0b169e1b387 100644 (file)
--- 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 357feed1e80009f5e19e8cbd750ee135051178ae..0521716549272d558418e3f826cf10870c271672 100644 (file)
--- 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. */