summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/Makefile.am4
-rw-r--r--src/modules/dbus-util.c2
-rw-r--r--src/modules/module-x11-publish.c2
-rw-r--r--src/pulsecore/authkey-prop.c2
-rw-r--r--src/pulsecore/cli-command.c2
-rw-r--r--src/pulsecore/core.c2
-rw-r--r--src/pulsecore/protocol-native.c2
-rw-r--r--src/pulsecore/shared.c (renamed from src/pulsecore/props.c)2
-rw-r--r--src/pulsecore/shared.h (renamed from src/pulsecore/props.h)0
-rw-r--r--src/pulsecore/x11wrap.c2
10 files changed, 10 insertions, 10 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 63707192..268409bd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -686,7 +686,7 @@ noinst_HEADERS = \
pulsecore/pid.h \
pulsecore/play-memchunk.h \
pulsecore/play-memblockq.h \
- pulsecore/props.h \
+ pulsecore/shared.h \
pulsecore/queue.h \
pulsecore/random.h \
pulsecore/resampler.h \
@@ -758,7 +758,7 @@ libpulsecore_la_SOURCES += \
pulsecore/play-memchunk.c pulsecore/play-memchunk.h \
pulsecore/play-memblockq.c pulsecore/play-memblockq.h \
pulsecore/poll.c pulsecore/poll.h \
- pulsecore/props.c pulsecore/props.h \
+ pulsecore/shared.c pulsecore/shared.h \
pulsecore/queue.c pulsecore/queue.h \
pulsecore/random.c pulsecore/random.h \
pulsecore/resampler.c pulsecore/resampler.h \
diff --git a/src/modules/dbus-util.c b/src/modules/dbus-util.c
index e18b6ab9..8e0066bc 100644
--- a/src/modules/dbus-util.c
+++ b/src/modules/dbus-util.c
@@ -27,7 +27,7 @@
#include <pulse/xmalloc.h>
#include <pulse/timeval.h>
#include <pulsecore/log.h>
-#include <pulsecore/props.h>
+#include <pulsecore/shared.h>
#include "dbus-util.h"
diff --git a/src/modules/module-x11-publish.c b/src/modules/module-x11-publish.c
index d0ce344f..4ef4873a 100644
--- a/src/modules/module-x11-publish.c
+++ b/src/modules/module-x11-publish.c
@@ -47,7 +47,7 @@
#include <pulsecore/authkey.h>
#include <pulsecore/x11prop.h>
#include <pulsecore/strlist.h>
-#include <pulsecore/props.h>
+#include <pulsecore/shared.h>
#include "module-x11-publish-symdef.h"
diff --git a/src/pulsecore/authkey-prop.c b/src/pulsecore/authkey-prop.c
index 9e147ec1..d52bdcf4 100644
--- a/src/pulsecore/authkey-prop.c
+++ b/src/pulsecore/authkey-prop.c
@@ -27,7 +27,7 @@
#include <pulse/xmalloc.h>
-#include <pulsecore/props.h>
+#include <pulsecore/shared.h>
#include <pulsecore/macro.h>
#include <pulsecore/log.h>
#include <pulsecore/refcnt.h>
diff --git a/src/pulsecore/cli-command.c b/src/pulsecore/cli-command.c
index 43ec1042..0bd4070c 100644
--- a/src/pulsecore/cli-command.c
+++ b/src/pulsecore/cli-command.c
@@ -49,7 +49,7 @@
#include <pulsecore/play-memchunk.h>
#include <pulsecore/autoload.h>
#include <pulsecore/sound-file-stream.h>
-#include <pulsecore/props.h>
+#include <pulsecore/shared.h>
#include <pulsecore/core-util.h>
#include <pulsecore/core-error.h>
diff --git a/src/pulsecore/core.c b/src/pulsecore/core.c
index 9aabd37d..fd836fb2 100644
--- a/src/pulsecore/core.c
+++ b/src/pulsecore/core.c
@@ -39,7 +39,7 @@
#include <pulsecore/core-scache.h>
#include <pulsecore/autoload.h>
#include <pulsecore/core-subscribe.h>
-#include <pulsecore/props.h>
+#include <pulsecore/shared.h>
#include <pulsecore/random.h>
#include <pulsecore/log.h>
#include <pulsecore/macro.h>
diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c
index f279b6af..853f2447 100644
--- a/src/pulsecore/protocol-native.c
+++ b/src/pulsecore/protocol-native.c
@@ -52,7 +52,7 @@
#include <pulsecore/autoload.h>
#include <pulsecore/authkey-prop.h>
#include <pulsecore/strlist.h>
-#include <pulsecore/props.h>
+#include <pulsecore/shared.h>
#include <pulsecore/sample-util.h>
#include <pulsecore/llist.h>
#include <pulsecore/creds.h>
diff --git a/src/pulsecore/props.c b/src/pulsecore/shared.c
index 1bfb297a..77d919d3 100644
--- a/src/pulsecore/props.c
+++ b/src/pulsecore/shared.c
@@ -27,7 +27,7 @@
#include <pulsecore/log.h>
#include <pulsecore/macro.h>
-#include "props.h"
+#include "shared.h"
typedef struct pa_shared {
char *name; /* Points to memory allocated by the shared property system */
diff --git a/src/pulsecore/props.h b/src/pulsecore/shared.h
index dd3f94e2..dd3f94e2 100644
--- a/src/pulsecore/props.h
+++ b/src/pulsecore/shared.h
diff --git a/src/pulsecore/x11wrap.c b/src/pulsecore/x11wrap.c
index 9186cf74..1519aa86 100644
--- a/src/pulsecore/x11wrap.c
+++ b/src/pulsecore/x11wrap.c
@@ -29,7 +29,7 @@
#include <pulsecore/llist.h>
#include <pulsecore/log.h>
-#include <pulsecore/props.h>
+#include <pulsecore/shared.h>
#include <pulsecore/core-util.h>
#include <pulsecore/macro.h>