Merge branch 'master' of git://0pointer.de/pulseaudio into dbus-work

[pulseaudio] / src / pulsecore / core-util.h

diff --git a/src/pulsecore/core-util.h b/src/pulsecore/core-util.h
index 3d3aec714f0509477aa7d4819b3b6144dbf2153e..8c13b5351965acbc34bf9690c03bda6d7ba9a37d 100644 (file)
--- a/src/pulsecore/core-util.h
+++ b/src/pulsecore/core-util.h
@@ -222,6 +222,13 @@ unsigned pa_ncpus(void);
 
 char *pa_replace(const char*s, const char*a, const char *b);
 
+/* Escapes p by inserting backslashes in front of backslashes. chars is a
+ * regular (ie. NULL-terminated) string containing additional characters that
+ * should be escaped. chars can be NULL. The caller has to free the returned
+ * string. */
+char *pa_escape(const char *p, const char *chars);
+
+/* Does regular backslash unescaping. Returns the argument p. */
 char *pa_unescape(char *p);
 
 char *pa_realpath(const char *path);
@@ -243,4 +250,8 @@ size_t pa_pipe_buf(int fd);
 
 void pa_reset_personality(void);
 
+#if defined(__linux__) && !defined(__OPTIMIZE__)
+pa_bool_t pa_run_from_build_tree(void);
+#endif
+
 #endif