From 5da35b1ee243f25c17dc9a5350ce6b56ed174031 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Tue, 24 Feb 2009 14:55:28 +0100 Subject: [PATCH] gconf: Rename gconf.[ch] to gstgconf.[ch] to prevent name conflicts --- ext/gconf/Makefile.am | 4 ++-- ext/gconf/{gconf.c => gstgconf.c} | 2 +- ext/gconf/{gconf.h => gstgconf.h} | 0 ext/gconf/gstgconfelements.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename ext/gconf/{gconf.c => gstgconf.c} (99%) rename ext/gconf/{gconf.h => gstgconf.h} (100%) diff --git a/ext/gconf/Makefile.am b/ext/gconf/Makefile.am index 4f6f63ad0c..330cf29fc0 100644 --- a/ext/gconf/Makefile.am +++ b/ext/gconf/Makefile.am @@ -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 diff --git a/ext/gconf/gconf.c b/ext/gconf/gstgconf.c similarity index 99% rename from ext/gconf/gconf.c rename to ext/gconf/gstgconf.c index e7214e2db9..eee80c9d97 100644 --- a/ext/gconf/gconf.c +++ b/ext/gconf/gstgconf.c @@ -29,7 +29,7 @@ #include -#include "gconf.h" +#include "gstgconf.h" #include "gstgconfelements.h" /* for debug category */ #ifndef GST_GCONF_DIR diff --git a/ext/gconf/gconf.h b/ext/gconf/gstgconf.h similarity index 100% rename from ext/gconf/gconf.h rename to ext/gconf/gstgconf.h diff --git a/ext/gconf/gstgconfelements.h b/ext/gconf/gstgconfelements.h index 1b3efe3cbc..872b2f2d90 100644 --- a/ext/gconf/gstgconfelements.h +++ b/ext/gconf/gstgconfelements.h @@ -20,7 +20,7 @@ #ifndef __GST_GCONF_ELEMENTS_H__ #define __GST_GCONF_ELEMENTS_H__ -#include +#include "gstgconf.h" GST_DEBUG_CATEGORY_EXTERN (gconf_debug); #define GST_CAT_DEFAULT gconf_debug