gst/gsttrace.h: Fix #ifdef nesting (bug #139109) Patch from jensgr@gmx.net (Jens Granseuer)

Original commit message from CVS:
* gst/gsttrace.h:  Fix #ifdef nesting (bug #139109) Patch from
jensgr@gmx.net (Jens Granseuer)
This commit is contained in:
David Schleef 2004-04-05 19:02:39 +00:00
parent f63e0209bf
commit cce13e8e5c
2 changed files with 8 additions and 6 deletions

View file

@ -1,3 +1,8 @@
2004-04-05 David Schleef <ds@schleef.org>
* gst/gsttrace.h: Fix #ifdef nesting (bug #139109) Patch from
jensgr@gmx.net (Jens Granseuer)
2004-04-05 David Schleef <ds@schleef.org> 2004-04-05 David Schleef <ds@schleef.org>
* gst/gstbuffer.c: (_gst_buffer_sub_free), * gst/gstbuffer.c: (_gst_buffer_sub_free),

View file

@ -24,12 +24,12 @@
#ifndef __GST_TRACE_H__ #ifndef __GST_TRACE_H__
#define __GST_TRACE_H__ #define __GST_TRACE_H__
#ifndef GST_DISABLE_TRACE
#include <glib.h> #include <glib.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#ifndef GST_DISABLE_TRACE
typedef struct _GstTrace GstTrace; typedef struct _GstTrace GstTrace;
typedef struct _GstTraceEntry GstTraceEntry; typedef struct _GstTraceEntry GstTraceEntry;
@ -125,15 +125,11 @@ G_STMT_START { \
#endif #endif
#ifndef GST_DISABLE_TRACE
extern gint _gst_trace_on; extern gint _gst_trace_on;
#define gst_trace_add_entry(trace,seq,data,msg) \ #define gst_trace_add_entry(trace,seq,data,msg) \
if (_gst_trace_on) { \ if (_gst_trace_on) { \
_gst_trace_add_entry(trace,(guint32)seq,(guint32)data,msg); \ _gst_trace_add_entry(trace,(guint32)seq,(guint32)data,msg); \
} }
#else
#define gst_trace_add_entry(trace,seq,data,msg)
#endif
#else /* GST_DISABLE_TRACE */ #else /* GST_DISABLE_TRACE */
@ -164,6 +160,7 @@ extern gint _gst_trace_on;
#define gst_alloc_trace_print(trace) #define gst_alloc_trace_print(trace)
#define gst_alloc_trace_set_flags(trace,flags) #define gst_alloc_trace_set_flags(trace,flags)
#define gst_trace_add_entry(trace,seq,data,msg)
#endif /* GST_DISABLE_TRACE */ #endif /* GST_DISABLE_TRACE */