diff options
author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2010-01-20 01:09:55 +0000 |
---|---|---|
committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2010-01-20 01:48:56 +0000 |
commit | 087aa6ced43d84abb487d1c386b62232c6d4d4fa (patch) | |
tree | 0e272472909f4758198c6d311ba5ac293fbd219c /gst | |
parent | 745b35e7d493f270804cedb35d90a1653968e29b (diff) | |
download | gstreamer-087aa6ced43d84abb487d1c386b62232c6d4d4fa.tar.gz |
gst_private.h: make sure gst_private.h is included before glib.h
For the reason outlined at the beginning of gst_private.h (inline
functions in glib may need the g_log_domain variable). Also include
gst_private.h before using any G_OS_* defines, esp. in plugin loader.
Diffstat (limited to 'gst')
-rw-r--r-- | gst/gst_private.h | 4 | ||||
-rw-r--r-- | gst/gstplugin.c | 4 | ||||
-rw-r--r-- | gst/gstpluginloader.c | 3 | ||||
-rw-r--r-- | gst/parse/grammar.y | 3 | ||||
-rw-r--r-- | gst/parse/parse.l | 4 |
5 files changed, 13 insertions, 5 deletions
diff --git a/gst/gst_private.h b/gst/gst_private.h index 423e937540..aa252bf769 100644 --- a/gst/gst_private.h +++ b/gst/gst_private.h @@ -33,6 +33,10 @@ * functions */ extern const char g_log_domain_gstreamer[]; +#ifdef __G_LIB_H__ +#warning "gst_private.h must be included before glib.h" +#endif + #include <glib.h> #include <stdlib.h> diff --git a/gst/gstplugin.c b/gst/gstplugin.c index 609a7890a9..a498cd23c0 100644 --- a/gst/gstplugin.c +++ b/gst/gstplugin.c @@ -49,6 +49,9 @@ #ifdef HAVE_CONFIG_H #include "config.h" #endif + +#include "gst_private.h" + #include <glib/gstdio.h> #include <sys/types.h> #ifdef HAVE_DIRENT_H @@ -60,7 +63,6 @@ #include <signal.h> #include <errno.h> -#include "gst_private.h" #include "glib-compat-private.h" #include <gst/gst.h> diff --git a/gst/gstpluginloader.c b/gst/gstpluginloader.c index dd0046bd7a..b4b3d606d3 100644 --- a/gst/gstpluginloader.c +++ b/gst/gstpluginloader.c @@ -24,6 +24,8 @@ # include "config.h" #endif +#include <gst/gst_private.h> + #ifndef G_OS_WIN32 #include <sys/types.h> #include <sys/wait.h> @@ -33,7 +35,6 @@ #endif #include <errno.h> -#include <gst/gst_private.h> #include <gst/gstconfig.h> #include <gst/gstpoll.h> diff --git a/gst/parse/grammar.y b/gst/parse/grammar.y index 00d0e9dc85..81a5e2a62f 100644 --- a/gst/parse/grammar.y +++ b/gst/parse/grammar.y @@ -1,11 +1,12 @@ %{ +#include "../gst_private.h" + #include <glib-object.h> #include <glib.h> #include <stdio.h> #include <string.h> #include <stdlib.h> -#include "../gst_private.h" #include "../gst-i18n-lib.h" #include "../gstconfig.h" diff --git a/gst/parse/parse.l b/gst/parse/parse.l index 9e60adcc18..b9162c2be2 100644 --- a/gst/parse/parse.l +++ b/gst/parse/parse.l @@ -1,11 +1,11 @@ %{ +#include "../gst_private.h" + #include <math.h> #include <string.h> #include <glib/gprintf.h> -#include "../gst_private.h" - #include "types.h" #include "../gstinfo.h" #include "../gsturi.h" |