summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2007-09-11 00:30:53 +0000
committerLennart Poettering <lennart@poettering.net>2007-09-11 00:30:53 +0000
commite2e2ce79e2697ecbd36e2cf00249dc8c59af232d (patch)
tree287283a2ded7028ed7631785b707a6ff46e9bc44
parent848a4d7487bdce14f8231698666fb24d5397e091 (diff)
Instead of including config.h from header files, check whether PACKAGE is defined and if not, fail (thus using PACKAGE as a check for inclusion of config.h)
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1799 fefdeb5f-60dc-0310-8127-8f9354f1896f
-rw-r--r--src/pulsecore/atomic.h5
-rw-r--r--src/pulsecore/creds.h4
-rw-r--r--src/pulsecore/endianmacros.h4
-rw-r--r--src/pulsecore/macro.h4
-rw-r--r--src/pulsecore/thread.h5
5 files changed, 13 insertions, 9 deletions
diff --git a/src/pulsecore/atomic.h b/src/pulsecore/atomic.h
index 0e3bfb9a..25d600c0 100644
--- a/src/pulsecore/atomic.h
+++ b/src/pulsecore/atomic.h
@@ -37,9 +37,8 @@
* libatomic_ops
*/
-/* We have to include config.h here (for the __sync stuff), which sucks */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
+#ifndef PACKAGE
+#error "Please include config.h before including this file!"
#endif
#ifdef HAVE_ATOMIC_BUILTINS
diff --git a/src/pulsecore/creds.h b/src/pulsecore/creds.h
index e0a025bd..51dfc33d 100644
--- a/src/pulsecore/creds.h
+++ b/src/pulsecore/creds.h
@@ -26,7 +26,9 @@
#include <sys/types.h>
-/* config.h must be included before this file */
+#ifndef PACKAGE
+#error "Please include config.h before including this file!"
+#endif
#ifdef HAVE_SYS_SOCKET_H
#include <sys/socket.h>
diff --git a/src/pulsecore/endianmacros.h b/src/pulsecore/endianmacros.h
index c0c3a6d8..a29699b9 100644
--- a/src/pulsecore/endianmacros.h
+++ b/src/pulsecore/endianmacros.h
@@ -27,8 +27,8 @@
#include <inttypes.h>
-#ifdef HAVE_CONFIG_H
-#include <config.h>
+#ifndef PACKAGE
+#error "Please include config.h before including this file!"
#endif
#define INT16_SWAP(x) ( (int16_t) ( ((uint16_t) x >> 8) | ((uint16_t) x << 8) ) )
diff --git a/src/pulsecore/macro.h b/src/pulsecore/macro.h
index 53e52fd0..c1bdb140 100644
--- a/src/pulsecore/macro.h
+++ b/src/pulsecore/macro.h
@@ -32,6 +32,10 @@
#include <pulsecore/log.h>
+#ifndef PACKAGE
+#error "Please include config.h before including this file!"
+#endif
+
#if defined(PAGE_SIZE)
#define PA_PAGE_SIZE ((size_t) PAGE_SIZE)
#elif defined(PAGESIZE)
diff --git a/src/pulsecore/thread.h b/src/pulsecore/thread.h
index a0e331be..4e5425d6 100644
--- a/src/pulsecore/thread.h
+++ b/src/pulsecore/thread.h
@@ -28,9 +28,8 @@
#include <pulse/def.h>
#include <pulsecore/once.h>
-/* We have to include config.h here (for the __tls stuff), which sucks */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
+#ifndef PACKAGE
+#error "Please include config.h before including this file!"
#endif
typedef struct pa_thread pa_thread;