Commit 5da35b1e authored by Sebastian Dröge's avatar Sebastian Dröge
Browse files

gconf: Rename gconf.[ch] to gstgconf.[ch] to prevent name conflicts

parent 6512b3eb
......@@ -7,7 +7,7 @@ libgstgconfelements_la_SOURCES = \
gstgconfvideosink.c \
gstgconfvideosrc.c \
gstswitchsink.c \
gconf.c
gstgconf.c
DIR_CFLAGS = -DGST_GCONF_DIR=\"/system/gstreamer/@GST_MAJORMINOR@\"
libgstgconfelements_la_CFLAGS = $(GST_CFLAGS) $(GCONF_CFLAGS) $(DIR_CFLAGS)
......@@ -22,4 +22,4 @@ noinst_HEADERS = \
gstgconfvideosink.h \
gstgconfvideosrc.h \
gstswitchsink.h \
gconf.h
gstgconf.h
......@@ -29,7 +29,7 @@
#include <gst/gst.h>
#include "gconf.h"
#include "gstgconf.h"
#include "gstgconfelements.h" /* for debug category */
#ifndef GST_GCONF_DIR
......
......@@ -20,7 +20,7 @@
#ifndef __GST_GCONF_ELEMENTS_H__
#define __GST_GCONF_ELEMENTS_H__
#include <gconf.h>
#include "gstgconf.h"
GST_DEBUG_CATEGORY_EXTERN (gconf_debug);
#define GST_CAT_DEFAULT gconf_debug
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment