summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 745b35e)
raw | patch | inline | side by side (parent: 745b35e)
author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | |
Wed, 20 Jan 2010 01:09:55 +0000 (01:09 +0000) | ||
committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | |
Wed, 20 Jan 2010 01:48:56 +0000 (01:48 +0000) |
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.
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.
diff --git a/gst/gst_private.h b/gst/gst_private.h
index 423e937540aa5c944f9b53da669142e0c1828137..aa252bf7698f3ca958ecdea44c62fc3a376f7f09 100644 (file)
--- a/gst/gst_private.h
+++ b/gst/gst_private.h
* 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 609a7890a999fac5f1e45add7d838175b787283c..a498cd23c0b6c6b225857ed1ee321c7031158ab6 100644 (file)
--- a/gst/gstplugin.c
+++ b/gst/gstplugin.c
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
+
+#include "gst_private.h"
+
#include <glib/gstdio.h>
#include <sys/types.h>
#ifdef HAVE_DIRENT_H
#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 dd0046bd7a0bc9dee6dc04f1eee630f1e32a2857..b4b3d606d34841be32ce0ec0677f05d953f7bbf3 100644 (file)
--- a/gst/gstpluginloader.c
+++ b/gst/gstpluginloader.c
# include "config.h"
#endif
+#include <gst/gst_private.h>
+
#ifndef G_OS_WIN32
#include <sys/types.h>
#include <sys/wait.h>
#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 00d0e9dc852d409fbd16bb18174a7076f9cd8e96..81a5e2a62fc7ba4e48389d63b8d3d2016c5dd21f 100644 (file)
--- a/gst/parse/grammar.y
+++ b/gst/parse/grammar.y
%{
+#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 9e60adcc18217260bf43628fbcb075f5dc27d584..b9162c2be23f15a874eab25e876e2b70cbf6f994 100644 (file)
--- a/gst/parse/parse.l
+++ b/gst/parse/parse.l
%{
+#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"
index 14b40215f4f16660fd6a64ebcfe1f33fbcecd12d..76f7a33ef35a51dfa8da31dee626e44197b35413 100644 (file)
# include "config.h"
#endif
+#include <gst/gst_private.h>
+
#include "gstbasesink.h"
#include <gst/gstmarshal.h>
-#include <gst/gst_private.h>
#include <gst/gst-i18n-lib.h>
GST_DEBUG_CATEGORY_STATIC (gst_base_sink_debug);
index 0310a748ca000856915fd84dcdcaccbfdd705d56..baa3019c779db890ea551bf3a6afd971608e28a7 100644 (file)
# include "config.h"
#endif
-#include <string.h>
-
-#include <gst/gst.h>
#include <gst/gst_private.h>
+#include <gst/gst.h>
+
+#include <string.h>
int
main (int argc, char *argv[])
index 0a32c6b395fc0408c848f5d290d2c2abda946a90..ba0bd0897e06dba34d7bd8c1868641e6c8af63e8 100644 (file)
# include "config.h"
#endif
-#include "gsttypefindelement.h"
#include "gst/gst_private.h"
+
+#include "gsttypefindelement.h"
#include "gst/gst-i18n-lib.h"
#include "gst/base/gsttypefindhelper.h"