summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2006-07-13 15:52:34 +0000
committerLennart Poettering <lennart@poettering.net>2006-07-13 15:52:34 +0000
commit10f7a6457545320595574ad249a3e9e1dd56c481 (patch)
treeff3fa96d651ebf0791dec001b2cc830b1afe65da
parent81621641b77cfa897cb136e670b9defaa4642fff (diff)
make sure gccmacro.h and cdecl.h may be included at the same time as those headers from the avahi project
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1067 fefdeb5f-60dc-0310-8127-8f9354f1896f
-rw-r--r--src/pulse/cdecl.h4
-rw-r--r--src/pulsecore/gccmacro.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/pulse/cdecl.h b/src/pulse/cdecl.h
index 6ac96687..a3ec231c 100644
--- a/src/pulse/cdecl.h
+++ b/src/pulse/cdecl.h
@@ -1,5 +1,5 @@
-#ifndef foocdeclhfoo
-#define foocdeclhfoo
+#ifndef foopulsecdeclhfoo
+#define foopulsecdeclhfoo
/* $Id$ */
diff --git a/src/pulsecore/gccmacro.h b/src/pulsecore/gccmacro.h
index 2ab999d9..8825700a 100644
--- a/src/pulsecore/gccmacro.h
+++ b/src/pulsecore/gccmacro.h
@@ -1,5 +1,5 @@
-#ifndef foogccmacrohfoo
-#define foogccmacrohfoo
+#ifndef foopulsegccmacrohfoo
+#define foopulsegccmacrohfoo
/* $Id$ */