Merge branch 'master' into dbus-work

[pulseaudio] / src / daemon / daemon-conf.h

diff --git a/src/daemon/daemon-conf.h b/src/daemon/daemon-conf.h
index c4f78cbef4415e5ee4ae57936472fe4337275be3..41c3c4b7d047d66996ed65a3f06509770e051e72 100644 (file)
--- a/src/daemon/daemon-conf.h
+++ b/src/daemon/daemon-conf.h
@@ -74,7 +74,8 @@ typedef struct pa_daemon_conf {
         disallow_exit,
         log_meta,
         log_time,
-        flat_volumes;
+        flat_volumes,
+        lock_memory;
     pa_server_type_t local_server_type;
     int exit_idle_time,
         scache_idle_time,