Merge commit 'origin/master-tx'

[pulseaudio] / src / daemon / caps.h

diff --git a/src/daemon/caps.h b/src/daemon/caps.h
index 5b21f12e0364943c81686fff2e04c03cc48d6fa2..5d0ee62e0bc1721909868d9f1272309fdcdcd3e9 100644 (file)
--- a/src/daemon/caps.h
+++ b/src/daemon/caps.h
@@ -1,8 +1,6 @@
 #ifndef foocapshfoo
 #define foocapshfoo
 
-/* $Id$ */
-
 /***
   This file is part of PulseAudio.
 
@@ -10,7 +8,7 @@
 
   PulseAudio 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; either version 2 of the License,
+  by the Free Software Foundation; either version 2.1 of the License,
   or (at your option) any later version.
 
   PulseAudio is distributed in the hope that it will be useful, but
@@ -24,8 +22,8 @@
   USA.
 ***/
 
+#include <pulsecore/macro.h>
+
 void pa_drop_root(void);
-void pa_drop_caps(void);
-void pa_limit_caps(void);
 
 #endif