Merge commit 'coling/master'

[pulseaudio] / src / pulse / util.h

diff --git a/src/pulse/util.h b/src/pulse/util.h
index 95bd86f36320f9e50f46adf9638a0ef1a2cf3d07..f6dd40cb6ed2bc15b62b94ac87e9f194a0809b03 100644 (file)
--- a/src/pulse/util.h
+++ b/src/pulse/util.h
@@ -1,8 +1,6 @@
 #ifndef fooutilhfoo
 #define fooutilhfoo
 
-/* $Id$ */
-
 /***
   This file is part of PulseAudio.
 
@@ -28,6 +26,8 @@
 #include <stddef.h>
 
 #include <pulse/cdecl.h>
+#include <pulse/gccmacro.h>
+#include <pulse/version.h>
 
 /** \file
  * Assorted utility functions */
@@ -52,7 +52,7 @@ char *pa_get_binary_name(char *s, size_t l);
 
 /** Return a pointer to the filename inside a path (which is the last
  * component). */
-const char *pa_path_get_filename(const char *p);
+char *pa_path_get_filename(const char *p);
 
 /** Wait t milliseconds */
 int pa_msleep(unsigned long t);