mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-03 05:59:10 +00:00
Code Issues 1 Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Sebastian Dröge 2009-02-24 14:55:28 +01:00
parent 6512b3eb81
commit 5da35b1ee2
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ext/gconf/Makefile.am
View file

@ -7,7 +7,7 @@ libgstgconfelements_la_SOURCES = \
gstgconfvideosink.c \ gstgconfvideosink.c \
gstgconfvideosrc.c \ gstgconfvideosrc.c \
gstswitchsink.c \ gstswitchsink.c \
gconf.c gstgconf.c
DIR_CFLAGS = -DGST_GCONF_DIR=\"/system/gstreamer/@GST_MAJORMINOR@\" DIR_CFLAGS = -DGST_GCONF_DIR=\"/system/gstreamer/@GST_MAJORMINOR@\"
libgstgconfelements_la_CFLAGS = $(GST_CFLAGS) $(GCONF_CFLAGS) $(DIR_CFLAGS) libgstgconfelements_la_CFLAGS = $(GST_CFLAGS) $(GCONF_CFLAGS) $(DIR_CFLAGS)
@ -22,4 +22,4 @@ noinst_HEADERS = \
gstgconfvideosink.h \ gstgconfvideosink.h \
gstgconfvideosrc.h \ gstgconfvideosrc.h \
gstswitchsink.h \ gstswitchsink.h \
gconf.h gstgconf.h

2
ext/gconf/gconf.c → ext/gconf/gstgconf.c
View file

@ -29,7 +29,7 @@
#include <gst/gst.h> #include <gst/gst.h>
#include "gconf.h" #include "gstgconf.h"
#include "gstgconfelements.h" /* for debug category */ #include "gstgconfelements.h" /* for debug category */
#ifndef GST_GCONF_DIR #ifndef GST_GCONF_DIR

0
ext/gconf/gconf.h → ext/gconf/gstgconf.h
View file

2
ext/gconf/gstgconfelements.h
View file

@ -20,7 +20,7 @@
#ifndef __GST_GCONF_ELEMENTS_H__ #ifndef __GST_GCONF_ELEMENTS_H__
#define __GST_GCONF_ELEMENTS_H__ #define __GST_GCONF_ELEMENTS_H__
#include <gconf.h> #include "gstgconf.h"
GST_DEBUG_CATEGORY_EXTERN (gconf_debug); GST_DEBUG_CATEGORY_EXTERN (gconf_debug);
#define GST_CAT_DEFAULT gconf_debug #define GST_CAT_DEFAULT gconf_debug