mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-16 19:25:18 +00:00
Code Issues 1 Projects Releases Wiki Activity

configure.ac: Set G_LOG_DOMAIN in config.h to a string literal.

Browse source 
Original commit message from CVS:
* configure.ac: Set G_LOG_DOMAIN in config.h to a string literal.
We should have done this all along.  Fixes #301646
* gst/Makefile.am:
* gst/gst.c: (init_post):
* gst/gst_private.h:
* gst/parse/grammar.y:
This commit is contained in:
David Schleef 2005-05-14 23:55:20 +00:00
parent f86d7df575
commit dda4ae6621
6 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2005-05-14 David Schleef <ds@schleef.org>
* configure.ac: Set G_LOG_DOMAIN in config.h to a string literal.
We should have done this all along. Fixes #301646
* gst/Makefile.am:
* gst/gst.c: (init_post):
* gst/gst_private.h:
* gst/parse/grammar.y:
2005-05-03 Thomas Vander Stichele <thomas at apestaart dot org> 2005-05-03 Thomas Vander Stichele <thomas at apestaart dot org>
* configure.ac: * configure.ac:

1
configure.ac
View file

@ -514,6 +514,7 @@ dnl ############################
dnl set license and copyright notice dnl set license and copyright notice
AC_DEFINE(GST_LICENSE, "LGPL", [GStreamer license]) AC_DEFINE(GST_LICENSE, "LGPL", [GStreamer license])
AC_DEFINE(G_LOG_DOMAIN, "GStreamer", [Glib log domain])
dnl package name in plugins dnl package name in plugins
AC_ARG_WITH(package-name, AC_ARG_WITH(package-name,

1
gst/Makefile.am
View file

@ -142,7 +142,6 @@ DISTCLEANFILES = $(built_header_configure)
libgstreamer_@GST_MAJORMINOR@_la_CFLAGS = \ libgstreamer_@GST_MAJORMINOR@_la_CFLAGS = \
-D_GNU_SOURCE \ -D_GNU_SOURCE \
$(GST_LIB_CFLAGS) \ $(GST_LIB_CFLAGS) \
-DG_LOG_DOMAIN=g_log_domain_gstreamer \
-DGST_MAJORMINOR=\""$(GST_MAJORMINOR)"\" -DGST_MAJORMINOR=\""$(GST_MAJORMINOR)"\"
libgstreamer_@GST_MAJORMINOR@_la_LIBADD = \ libgstreamer_@GST_MAJORMINOR@_la_LIBADD = \
$(GST_LIB_LIBS) $(GST_PARSE_LIBADD) $(GST_REGISTRY_LIBADD) $(GST_LIB_LIBS) $(GST_PARSE_LIBADD) $(GST_REGISTRY_LIBADD)

4
gst/gst.c
View file

@ -67,8 +67,6 @@ static gboolean init_post (void);
static GSList *preload_plugins = NULL; static GSList *preload_plugins = NULL;
const gchar *g_log_domain_gstreamer = "GStreamer";
static void static void
debug_log_handler (const gchar * log_domain, debug_log_handler (const gchar * log_domain,
GLogLevelFlags log_level, const gchar * message, gpointer user_data) GLogLevelFlags log_level, const gchar * message, gpointer user_data)
@ -576,7 +574,7 @@ init_post (void)
#endif /* GST_DISABLE_TRACE */ #endif /* GST_DISABLE_TRACE */
llf = G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_ERROR | G_LOG_FLAG_FATAL; llf = G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_ERROR | G_LOG_FLAG_FATAL;
g_log_set_handler (g_log_domain_gstreamer, llf, debug_log_handler, NULL); g_log_set_handler (G_LOG_DOMAIN, llf, debug_log_handler, NULL);
_gst_format_initialize (); _gst_format_initialize ();
_gst_query_type_initialize (); _gst_query_type_initialize ();

4
gst/gst_private.h
View file

@ -28,10 +28,6 @@
# include "config.h" # include "config.h"
#endif #endif
/* This needs to be before glib.h, since it might be used in inline
* functions */
extern const char *g_log_domain_gstreamer;
#include <glib.h> #include <glib.h>
#include <stdlib.h> #include <stdlib.h>

3
gst/parse/grammar.y
View file

@ -1,11 +1,12 @@
%{ %{
#include "../gst_private.h"
#include <glib-object.h> #include <glib-object.h>
#include <glib.h> #include <glib.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include "../gst_private.h"
#include "../gst-i18n-lib.h" #include "../gst-i18n-lib.h"
#include "../gstconfig.h" #include "../gstconfig.h"