From 55a3eaafea583ef65ab30b379c20e1cf8853f7b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.net>
Date: Wed, 31 Oct 2007 15:30:15 +0000
Subject: [PATCH] gst-libs/gst/audio/audio.h: Don't guard deprecated enum with
 #ifndef DISABLE_DEPRECATED, or compilation with DISABLE_...

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.
---
 ChangeLog                  | 7 +++++++
 gst-libs/gst/audio/audio.h | 2 --
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 29e07124e6..501e63e169 100644
--- 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 4db99dad04..749def542a 100644
--- 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);