summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--compiler.h17
-rw-r--r--gpsd.h-tail17
2 files changed, 17 insertions, 17 deletions
diff --git a/compiler.h b/compiler.h
index 0e704527..b6919aaa 100644
--- a/compiler.h
+++ b/compiler.h
@@ -7,6 +7,23 @@
#ifndef _GPSD_COMPILER_H_
#define _GPSD_COMPILER_H_
+/*
+ * Tell GCC that we want thread-safe behavior with _REENTRANT;
+ * in particular, errno must be thread-local.
+ * Tell POSIX-conforming implementations with _POSIX_THREAD_SAFE_FUNCTIONS.
+ * See http://www.unix.org/whitepapers/reentrant.html
+ */
+#ifndef _REENTRANT
+#define _REENTRANT
+#endif
+#ifndef _POSIX_THREAD_SAFE_FUNCTIONS
+#define _POSIX_THREAD_SAFE_FUNCTIONS
+#endif
+
+#ifdef _WIN32
+typedef unsigned int speed_t;
+#endif
+
#include "gpsd_config.h" /* is HAVE_STDATOMIC defined? */
/* Macro for declaring function with printf-like arguments. */
diff --git a/gpsd.h-tail b/gpsd.h-tail
index 09e4064a..10a15751 100644
--- a/gpsd.h-tail
+++ b/gpsd.h-tail
@@ -12,23 +12,6 @@
#include "compiler.h"
/*
- * Tell GCC that we want thread-safe behavior with _REENTRANT;
- * in particular, errno must be thread-local.
- * Tell POSIX-conforming implementations with _POSIX_THREAD_SAFE_FUNCTIONS.
- * See http://www.unix.org/whitepapers/reentrant.html
- */
-#ifndef _REENTRANT
-#define _REENTRANT
-#endif
-#ifndef _POSIX_THREAD_SAFE_FUNCTIONS
-#define _POSIX_THREAD_SAFE_FUNCTIONS
-#endif
-
-#ifdef _WIN32
-typedef unsigned int speed_t;
-#endif
-
-/*
* Constants for the VERSION response
* 3.1: Base JSON version
* 3.2: Added POLL command and response