compat: move the gettid macro to compat.h.

New header, meant for various compatibility definitions and such.

Signed-off-by: Gediminas Jakutis <gediminas@varciai.lt>

4 files changed, 46 insertions, 12 deletions

diff --git a/include/rin/compat.h b/include/rin/compat.h
new file mode 100644
index 0000000..035f2b5
--- /dev/null
+++ b/include/rin/compat.h
@@ -0,0 +1,41 @@
+/*
+ * The Rin Library – various compatibility constructs
+ *
+ * Copyright (C) 2015 Gediminas Jakutis
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; version 2.1
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#ifndef LIBRIN_COMPAT_INCLUDED
+#define LIBRIN_COMPAT_INCLUDED
+
+#ifdef RIN_NEED_GETTID
+#include <unistd.h>
+
+#	ifdef __GLIBC__
+
+#		if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 29)
+#			include <sys/types.h>
+#		else
+#			define _GNU_SOURCE
+#			include <sys/syscall.h>
+#			define gettid() (syscall(SYS_gettid))
+#		endif
+
+#	endif
+#endif /* RIN_NEED_GETTID */
+
+
+#endif /* LIBRIN_COMPAT_INCLUDED */
diff --git a/include/rin/meson.build b/include/rin/meson.build
index 3e1c1a9..b7af3aa 100644
--- a/include/rin/meson.build
+++ b/include/rin/meson.build
@@ -1,4 +1,5 @@
 headers = [
+	'compat.h',
 	'definitions.h',
 	'diagnostic.h',
 	'float.h',
diff --git a/src/diagnostic/diagnostic.c b/src/diagnostic/diagnostic.c
index 58a0292..638df52 100644
--- a/src/diagnostic/diagnostic.c
+++ b/src/diagnostic/diagnostic.c
@@ -18,11 +18,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "diagnostic_private.h"
+
 #include <string.h>
 #include <time.h>
 #include "rin/diagnostic.h"
 #include "rin/definitions.h"
-#include "diagnostic_private.h"
 
 static struct iostate {
 	FILE *err;
diff --git a/src/diagnostic/diagnostic_private.h b/src/diagnostic/diagnostic_private.h
index 45d414d..96b1759 100644
--- a/src/diagnostic/diagnostic_private.h
+++ b/src/diagnostic/diagnostic_private.h
@@ -24,18 +24,9 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <errno.h>
-#include <unistd.h>
-
-#ifdef __GLIBC__
-#	if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 29)
-#		include <sys/types.h>
-#	else
-#		define _GNU_SOURCE
-#		include <sys/syscall.h>
-#		define gettid() (syscall(SYS_gettid))
-#	endif
-#endif
 
+#define RIN_NEED_GETTID
+#include "rin/compat.h"
 
 static void __rin_msg(FILE *stream, const char *prefix, const char *format, va_list args);
 static void __rin_pidconvadjust(void);