gst-libs/gst/audio/audio.h: Don't guard deprecated enum with #ifndef DISABLE_DEPRECAT...

Original commit message from CVS:
* gst-libs/gst/audio/audio.h:
Don't guard deprecated enum with #ifndef DISABLE_DEPRECATED, or
compilation with DISABLE_DEPRECATED and without REMOVE_DEPRECATED
(ie. normal cvs builds) will fail.

diff --git a/ChangeLog b/ChangeLog
index 29e07124e629c9b203c6283b9aa3b58a7b133027..501e63e169c335f995c37b589b78ceb1b2c459d3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-10-31  Tim-Philipp Müller  <tim at centricular dot net>
+
+       * gst-libs/gst/audio/audio.h:
+         Don't guard deprecated enum with #ifndef DISABLE_DEPRECATED, or
+         compilation with DISABLE_DEPRECATED and without REMOVE_DEPRECATED
+         (ie. normal cvs builds) will fail.
+
 2007-10-31  Stefan Kost  <ensonic@users.sf.net>
 
        * docs/libs/Makefile.am:

diff --git a/gst-libs/gst/audio/audio.h b/gst-libs/gst/audio/audio.h
index 4db99dad0485bd6730aee80ca49facbd220e3dd1..749def542af933c3d08efae0201fbe0aa8f3d0b8 100644 (file)
--- a/gst-libs/gst/audio/audio.h
+++ b/gst-libs/gst/audio/audio.h
@@ -135,7 +135,6 @@ gboolean gst_audio_is_buffer_framed     (GstPad* pad, GstBuffer* buf);
  *
  * Deprecated: use gst_structure_set() directly
  */
-#ifndef GST_DISABLE_DEPRECATED
 typedef enum {
   GST_AUDIO_FIELD_RATE          = (1 << 0),
   GST_AUDIO_FIELD_CHANNELS      = (1 << 1),
@@ -144,7 +143,6 @@ typedef enum {
   GST_AUDIO_FIELD_DEPTH         = (1 << 4),
   GST_AUDIO_FIELD_SIGNED        = (1 << 5),
 } GstAudioFieldFlag;
-#endif /* GST_DISABLE_DEPRECATED */
 
 #ifndef GST_DISABLE_DEPRECATED
 void gst_audio_structure_set_int (GstStructure *structure, GstAudioFieldFlag flag);