[gtk+/gtk-2-22] gdk: Simplify deprecation guards in gdkdrawable.h

[Benjamin Otte <otte src gnome org>]

commit f36bb4d91d1a7e62a239164622309385e0b507ae
Author: Benjamin Otte <otte redhat com>
Date:   Sat Aug 7 02:51:42 2010 +0200

    gdk: Simplify deprecation guards in gdkdrawable.h

 gdk/gdkdrawable.h |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/gdk/gdkdrawable.h b/gdk/gdkdrawable.h
index 44beaf7..264deee 100644
--- a/gdk/gdkdrawable.h
+++ b/gdk/gdkdrawable.h
@@ -299,7 +299,7 @@ void gdk_draw_polygon   (GdkDrawable      *drawable,
 			 gboolean          filled,
 			 const GdkPoint   *points,
 			 gint              n_points);
-#if !defined (GDK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
+#ifndef GDK_DISABLE_DEPRECATED
 /* Used by gtk_default_draw_string () */
 void gdk_draw_string    (GdkDrawable      *drawable,
 			 GdkFont          *font,
@@ -307,8 +307,6 @@ void gdk_draw_string    (GdkDrawable      *drawable,
 			 gint              x,
 			 gint              y,
 			 const gchar      *string);
-#endif /* !GDK_DISABLE_DEPRECATED || GTK_COMPILATION */
-#if !defined (GDK_DISABLE_DEPRECATED) || defined (GDK_COMPILATION)
 /* Used by gdk_pixmap_draw_text (), gdk_window_draw_text() */
 void gdk_draw_text      (GdkDrawable      *drawable,
 			 GdkFont          *font,
@@ -325,7 +323,7 @@ void gdk_draw_text_wc   (GdkDrawable      *drawable,
 			 gint              y,
 			 const GdkWChar   *text,
 			 gint              text_length);
-#endif /* !GDK_DISABLE_DEPRECATED || GDK_COMPILATION */
+#endif /* !GDK_DISABLE_DEPRECATED */
 void gdk_draw_drawable  (GdkDrawable      *drawable,
 			 GdkGC            *gc,
 			 GdkDrawable      *src,