gst/gstinfo.h: wrap #pragmas in #ifdefs for the correct compiler

Original commit message from CVS:
* gst/gstinfo.h: wrap #pragmas in #ifdefs for the correct compiler
* gst/gstobject.h:
* gst/gstparse.h:
* gst/gsttrace.h:
* gst/gstxml.h:

diff --git a/ChangeLog b/ChangeLog
index 995114b..c18aa24 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-07-02  David Schleef  <ds@schleef.org>
+
+       * gst/gstinfo.h: wrap #pragmas in #ifdefs for the correct compiler
+       * gst/gstobject.h:
+       * gst/gstparse.h:
+       * gst/gsttrace.h:
+       * gst/gstxml.h:
+
 2004-07-02  Thomas Vander Stichele  <thomas at apestaart dot org>
 
        * gst/gstpad.c: (gst_pad_check_schedulers),

diff --git a/gst/gstinfo.h b/gst/gstinfo.h
index 7f35653..c875774 100644 (file)
--- a/gst/gstinfo.h
+++ b/gst/gstinfo.h
@@ -597,7 +597,7 @@ G_CONST_RETURN gchar*
 
 #else /* GST_DISABLE_GST_DEBUG */
 
-#ifdef __GNUC__
+#if defined(__GNUC__) && __GNUC__ >= 3
 #  pragma GCC poison gst_debug_log
 #  pragma GCC poison gst_debug_log_valist
 #  pragma GCC poison _gst_debug_category_new

diff --git a/gst/gstobject.h b/gst/gstobject.h
index a036002..bbb9dc8 100644 (file)
--- a/gst/gstobject.h
+++ b/gst/gstobject.h
@@ -132,9 +132,11 @@ gboolean   gst_object_check_uniqueness     (GList *list, const gchar *name);
 xmlNodePtr     gst_object_save_thyself         (GstObject *object, xmlNodePtr parent);
 void           gst_object_restore_thyself      (GstObject *object, xmlNodePtr self);
 #else
+#if defined _GNUC_ && _GNUC_ >= 3
 #pragma GCC poison gst_object_save_thyself
 #pragma GCC poison gst_object_restore_thyself
 #endif
+#endif
 
 /* refcounting + life cycle */
 GstObject *    gst_object_ref                  (GstObject *object);
@@ -157,8 +159,10 @@ void               gst_class_signal_emit_by_name   (GstObject      *object,
                                                 const gchar    *name,
                                                 xmlNodePtr      self);
 #else
+#if defined _GNUC_ && _GNUC_ >= 3
 #pragma GCC poison gst_class_signal_emit_by_name
 #endif
+#endif
 
 
 G_END_DECLS

diff --git a/gst/gstparse.h b/gst/gstparse.h
index 70e2460..a63fa24 100644 (file)
--- a/gst/gstparse.h
+++ b/gst/gstparse.h
@@ -49,8 +49,10 @@ GstElement*  gst_parse_launchv       (const gchar **argv, GError **error);
 
 #else /* GST_DISABLE_PARSE */
 
+#if defined _GNUC_ && _GNUC_ >= 3
 #pragma GCC poison gst_parse_launch
 #pragma GCC poison gst_parse_launchv
+#endif
 
 #endif /* GST_DISABLE_PARSE */
 

diff --git a/gst/gsttrace.h b/gst/gsttrace.h
index d6c8dda..5a0cde3 100644 (file)
--- a/gst/gsttrace.h
+++ b/gst/gsttrace.h
@@ -133,6 +133,7 @@ extern gint _gst_trace_on;
 
 #else /* GST_DISABLE_TRACE */
 
+#if defined _GNUC_ && _GNUC_ >= 3
 #pragma GCC poison     gst_trace_new   
 #pragma GCC poison     gst_trace_destroy
 #pragma GCC poison     gst_trace_flush
@@ -144,6 +145,7 @@ extern gint _gst_trace_on;
 #pragma GCC poison     _gst_trace_add_entry
 #pragma GCC poison     gst_trace_read_tsc
 #pragma GCC poison     gst_trace_add_entry
+#endif
 
 #define                gst_alloc_trace_register(name)
 #define                gst_alloc_trace_new(trace, mem) 

diff --git a/gst/gstxml.h b/gst/gstxml.h
index 6c12c3e..db34c26 100644 (file)
--- a/gst/gstxml.h
+++ b/gst/gstxml.h
@@ -89,6 +89,7 @@ G_END_DECLS
 
 #else /* GST_DISABLE_LOADSAVE */
 
+#if defined _GNUC_ && _GNUC_ >= 3
 #pragma GCC poison gst_xml_write
 #pragma GCC poison gst_xml_new
 #pragma GCC poison gst_xml_parse_doc
@@ -96,6 +97,7 @@ G_END_DECLS
 #pragma GCC poison gst_xml_parse_memory
 #pragma GCC poison gst_xml_get_element
 #pragma GCC poison gst_xml_get_topelements
+#endif
 
 #endif /* GST_DISABLE_LOADSAVE */