don't add os/base.h

dgrove-oss · dgrove-oss · commit 10b9e9432c7e · 2015-12-04T20:36:14.000Z
diff --git a/os/Makefile.am b/os/Makefile.am
@@ -6,7 +6,6 @@ osdir=$(includedir)/os
 
 os_HEADERS=	\
 	object.h \
-	base.h \
 	linux_base.h
 
 noinst_HEADERS=	\
diff --git a/os/base.h b/os/base.h
diff --git a/os/object.h b/os/object.h
@@ -24,7 +24,11 @@
 #ifdef __APPLE__
 #include <Availability.h>
 #endif
+#ifndef __linux__
 #include <os/base.h>
+#else
+#include <os/linux_base.h>
+#endif
 
 /*!
  * @header
diff --git a/private/voucher_private.h b/private/voucher_private.h
@@ -21,7 +21,9 @@
 #ifndef __OS_VOUCHER_PRIVATE__
 #define __OS_VOUCHER_PRIVATE__
 
+#ifndef __linux__
 #include <os/base.h>
+#endif
 #include <os/object.h>
 
 #define OS_VOUCHER_SPI_VERSION 20141203
diff --git a/src/shims/linux_stubs.c b/src/shims/linux_stubs.c
@@ -31,7 +31,7 @@
 
 #define program_invocation_short_name "hi"
 
-#include "os/base.h"
+#include "os/linux_base.h"
 #include "internal.h"
 
 
