summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c0a3f9e)
raw | patch | inline | side by side (parent: c0a3f9e)
author | Peter Kjellerstedt <pkj@axis.com> | |
Tue, 18 Jul 2006 09:42:31 +0000 (09:42 +0000) | ||
committer | Wim Taymans <wim.taymans@gmail.com> | |
Tue, 18 Jul 2006 09:42:31 +0000 (09:42 +0000) |
Original commit message from CVS:
Patch by: Peter Kjellerstedt <pkj at axis dot com>
* gst/Makefile.am:
* gst/gsttrace.h:
The attached patch adds two missing defines to gsttrace.h when tracing
is disabled. It also corrects one existing define.
Fixes #347756.
Patch by: Peter Kjellerstedt <pkj at axis dot com>
* gst/Makefile.am:
* gst/gsttrace.h:
The attached patch adds two missing defines to gsttrace.h when tracing
is disabled. It also corrects one existing define.
Fixes #347756.
ChangeLog | patch | blob | history | |
gst/Makefile.am | patch | blob | history | |
gst/gsttrace.h | patch | blob | history |
diff --git a/ChangeLog b/ChangeLog
index 7b37a20784c426f6ac6babc81534c0a95b48dec6..9ee6b6c55df8588261b8ddbd99c382e27af1741e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
+2006-07-18 Wim Taymans <wim@fluendo.com>
+
+ Patch by: Peter Kjellerstedt <pkj at axis dot com>
+
+ * gst/Makefile.am:
+ * gst/gsttrace.h:
+ The attached patch adds two missing defines to gsttrace.h when tracing
+ is disabled. It also corrects one existing define.
+ Fixes #347756.
+
2006-07-17 Wim Taymans <wim@fluendo.com>
* docs/gst/gstreamer-sections.txt:
diff --git a/gst/Makefile.am b/gst/Makefile.am
index 8ab3ff0316d068627575b0d40cd18f0074cf0a6b..8e1c1362125590175d52cbdf371b97983cd74b48 100644 (file)
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
if GST_DISABLE_TRACE
GST_TRACE_SRC =
-GST_TRACE_H =
else
GST_TRACE_SRC = gsttrace.c
-GST_TRACE_H = gsttrace.h
endif
if GST_DISABLE_ENUMTYPES
gsttaglist.h \
gsttagsetter.h \
gsttask.h \
- $(GST_TRACE_H) \
+ gsttrace.h \
gsttypefind.h \
gsttypefindfactory.h \
gsturi.h \
$(built_header_configure) $(built_header_make)
EXTRA_DIST = \
- gstparse.h \
- gsttrace.h
+ gstparse.h
noinst_HEADERS = \
gettext.h \
diff --git a/gst/gsttrace.h b/gst/gsttrace.h
index 91dab2f0d7be9768118d40a25dbab58c5f3ee319..45b5b0700065bea0edd04c882a82647b958f4ecc 100644 (file)
--- a/gst/gsttrace.h
+++ b/gst/gsttrace.h
G_BEGIN_DECLS
+/**
+ * GstAllocTraceFlags:
+ * @GST_ALLOC_TRACE_LIVE: Trace number of non-freed memory
+ * @GST_ALLOC_TRACE_MEM_LIVE: trace pointers of unfreed memory
+ *
+ * Flags indicating which tracing feature to enable.
+ */
+typedef enum {
+ GST_ALLOC_TRACE_LIVE = (1 << 0),
+ GST_ALLOC_TRACE_MEM_LIVE = (1 << 1)
+} GstAllocTraceFlags;
+
+typedef struct _GstAllocTrace GstAllocTrace;
+
+/**
+ * GstAllocTrace:
+ * @name: The name of the tracing object
+ * @flags: Flags for this object
+ * @live: counter for live memory
+ * @mem_live: list with pointers to unfreed memory
+ *
+ * The main tracing object
+ */
+struct _GstAllocTrace {
+ gchar *name;
+ gint flags;
+
+ gint live;
+ GSList *mem_live;
+};
+
#ifndef GST_DISABLE_TRACE
typedef struct _GstTrace GstTrace;
void gst_trace_read_tsc (gint64 *dst);
-/**
- * GstAllocTraceFlags:
- * @GST_ALLOC_TRACE_LIVE: Trace number of non-freed memory
- * @GST_ALLOC_TRACE_MEM_LIVE: trace pointers of unfreed memory
- *
- * Flags indicating which tracing feature to enable.
- */
-typedef enum {
- GST_ALLOC_TRACE_LIVE = (1 << 0),
- GST_ALLOC_TRACE_MEM_LIVE = (1 << 1)
-} GstAllocTraceFlags;
-
-typedef struct _GstAllocTrace GstAllocTrace;
-
-/**
- * GstAllocTrace:
- * @name: The name of the tracing object
- * @flags: Flags for this object
- * @live: counter for live memory
- * @mem_live: list with pointers to unfreed memory
- *
- * The main tracing object
- */
-struct _GstAllocTrace {
- gchar *name;
- gint flags;
-
- gint live;
- GSList *mem_live;
-};
-
gboolean gst_alloc_trace_available (void);
G_CONST_RETURN GList* gst_alloc_trace_list (void);
GstAllocTrace* _gst_alloc_trace_register (const gchar *name);
#pragma GCC poison gst_trace_add_entry
#endif
-#define gst_alloc_trace_register(name)
+#define gst_alloc_trace_register(name) (NULL)
#define gst_alloc_trace_new(trace, mem)
#define gst_alloc_trace_free(trace, mem)
#define gst_alloc_trace_list() (NULL)
#define _gst_alloc_trace_register(name) (NULL)
+#define gst_alloc_trace_live_all() (0)
#define gst_alloc_trace_print_all()
+#define gst_alloc_trace_print_live()
#define gst_alloc_trace_set_flags_all(flags)
#define gst_alloc_trace_get(name) (NULL)