From 19b5b71feb51544a442b71af725d26aae2c55527 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 16 Feb 2006 23:11:28 +0000
Subject: [PATCH] * drop polylib prefix from #define * include error.h from
 polypaudio.h

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@494 fefdeb5f-60dc-0310-8127-8f9354f1896f
---
 src/polyp/browser.h    | 4 ++--
 src/polyp/context.h    | 4 ++--
 src/polyp/def.h        | 4 ++--
 src/polyp/error.h      | 4 ++--
 src/polyp/internal.h   | 4 ++--
 src/polyp/introspect.h | 4 ++--
 src/polyp/operation.h  | 4 ++--
 src/polyp/polypaudio.h | 7 ++++---
 src/polyp/scache.h     | 4 ++--
 src/polyp/simple.h     | 4 ++--
 src/polyp/stream.h     | 4 ++--
 src/polyp/subscribe.h  | 4 ++--
 src/polyp/version.h.in | 4 ++--
 13 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/src/polyp/browser.h b/src/polyp/browser.h
index 853304d7d..3bb0d2649 100644
--- a/src/polyp/browser.h
+++ b/src/polyp/browser.h
@@ -1,5 +1,5 @@
-#ifndef foopolyplibbrowserhfoo
-#define foopolyplibbrowserhfoo
+#ifndef foobrowserhfoo
+#define foobrowserhfoo
 
 /* $Id$ */
 
diff --git a/src/polyp/context.h b/src/polyp/context.h
index 6496c7030..216d7d87d 100644
--- a/src/polyp/context.h
+++ b/src/polyp/context.h
@@ -1,5 +1,5 @@
-#ifndef foopolyplibcontexthfoo
-#define foopolyplibcontexthfoo
+#ifndef foocontexthfoo
+#define foocontexthfoo
 
 /* $Id$ */
 
diff --git a/src/polyp/def.h b/src/polyp/def.h
index 0591ce6c1..ba35b31e8 100644
--- a/src/polyp/def.h
+++ b/src/polyp/def.h
@@ -1,5 +1,5 @@
-#ifndef foopolyplibdefhfoo
-#define foopolyplibdefhfoo
+#ifndef foodefhfoo
+#define foodefhfoo
 
 /* $Id$ */
 
diff --git a/src/polyp/error.h b/src/polyp/error.h
index 1bb978224..ff2507b21 100644
--- a/src/polyp/error.h
+++ b/src/polyp/error.h
@@ -1,5 +1,5 @@
-#ifndef foopolypliberrorhfoo
-#define foopolypliberrorhfoo
+#ifndef fooerrorhfoo
+#define fooerrorhfoo
 
 /* $Id$ */
 
diff --git a/src/polyp/internal.h b/src/polyp/internal.h
index feb9f6f41..bdfd5d8ec 100644
--- a/src/polyp/internal.h
+++ b/src/polyp/internal.h
@@ -1,5 +1,5 @@
-#ifndef foopolyplibinternalhfoo
-#define foopolyplibinternalhfoo
+#ifndef foointernalhfoo
+#define foointernalhfoo
 
 /* $Id$ */
 
diff --git a/src/polyp/introspect.h b/src/polyp/introspect.h
index 75dc027f6..0abb54cf2 100644
--- a/src/polyp/introspect.h
+++ b/src/polyp/introspect.h
@@ -1,5 +1,5 @@
-#ifndef foopolyplibintrospecthfoo
-#define foopolyplibintrospecthfoo
+#ifndef foointrospecthfoo
+#define foointrospecthfoo
 
 /* $Id$ */
 
diff --git a/src/polyp/operation.h b/src/polyp/operation.h
index fea82f10e..6a24d6495 100644
--- a/src/polyp/operation.h
+++ b/src/polyp/operation.h
@@ -1,5 +1,5 @@
-#ifndef foopolypliboperationhfoo
-#define foopolypliboperationhfoo
+#ifndef foooperationhfoo
+#define foooperationhfoo
 
 /* $Id$ */
 
diff --git a/src/polyp/polypaudio.h b/src/polyp/polypaudio.h
index 232085268..c6014bbb4 100644
--- a/src/polyp/polypaudio.h
+++ b/src/polyp/polypaudio.h
@@ -1,5 +1,5 @@
-#ifndef foopolyplibhfoo
-#define foopolyplibhfoo
+#ifndef foopolypaudiohfoo
+#define foopolypaudiohfoo
 
 /* $Id$ */
 
@@ -32,11 +32,12 @@
 #include <polyp/subscribe.h>
 #include <polyp/scache.h>
 #include <polyp/version.h>
+#include <polyp/error.h>
 
 /** \file
  * Include all polyplib header file at once. The following files are included: \ref mainloop-api.h, \ref sample.h,
  * \ref def.h, \ref context.h, \ref stream.h,
- * \ref introspect.h, \ref subscribe.h and \ref scache.h \ref version.h
+ * \ref introspect.h, \ref subscribe.h, \ref scache.h, \ref version.h \ref error.h
  * at once */
 
 /** \mainpage
diff --git a/src/polyp/scache.h b/src/polyp/scache.h
index 41b956d2e..5bf004d0a 100644
--- a/src/polyp/scache.h
+++ b/src/polyp/scache.h
@@ -1,5 +1,5 @@
-#ifndef foopolyplibscachehfoo
-#define foopolyplibscachehfoo
+#ifndef fooscachehfoo
+#define fooscachehfoo
 
 /* $Id$ */
 
diff --git a/src/polyp/simple.h b/src/polyp/simple.h
index 31dcaef49..270cbb24a 100644
--- a/src/polyp/simple.h
+++ b/src/polyp/simple.h
@@ -1,5 +1,5 @@
-#ifndef foopolyplibsimplehfoo
-#define foopolyplibsimplehfoo
+#ifndef foosimplehfoo
+#define foosimplehfoo
 
 /* $Id$ */
 
diff --git a/src/polyp/stream.h b/src/polyp/stream.h
index d8409b3bf..e2cab19e9 100644
--- a/src/polyp/stream.h
+++ b/src/polyp/stream.h
@@ -1,5 +1,5 @@
-#ifndef foopolyplibstreamhfoo
-#define foopolyplibstreamhfoo
+#ifndef foostreamhfoo
+#define foostreamhfoo
 
 /* $Id$ */
 
diff --git a/src/polyp/subscribe.h b/src/polyp/subscribe.h
index 4986272d0..f1f0642d9 100644
--- a/src/polyp/subscribe.h
+++ b/src/polyp/subscribe.h
@@ -1,5 +1,5 @@
-#ifndef foopolyplibsubscribehfoo
-#define foopolyplibsubscribehfoo
+#ifndef foosubscribehfoo
+#define foosubscribehfoo
 
 /* $Id$ */
 
diff --git a/src/polyp/version.h.in b/src/polyp/version.h.in
index 36cafb70f..c727381f3 100644
--- a/src/polyp/version.h.in
+++ b/src/polyp/version.h.in
@@ -1,5 +1,5 @@
-#ifndef foopolyplibversionhfoo /*-*-C-*-*/
-#define foopolyplibversionhfoo
+#ifndef fooversionhfoo /*-*-C-*-*/
+#define fooversionhfoo
 
 /* $Id$ */