summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Natterer <mitch@imendio.com>2008-05-30 12:08:30 +0000
committerMichael Natterer <mitch@src.gnome.org>2008-05-30 12:08:30 +0000
commitf18bfd0aacef291c0f989b7da908ff8507153f9e (patch)
tree02a9a2d3c12575ad726c81b758f9c7d722d12415
parent24d2f90ac370c093c48e712050e90ced49707104 (diff)
downloadgtk+-f18bfd0aacef291c0f989b7da908ff8507153f9e.tar.gz
gdk/gdkapplaunchcontext.h gdk/gdktestutils.h gtk/gtkmountoperation.h
2008-05-30 Michael Natterer <mitch@imendio.com> * gdk/gdkapplaunchcontext.h * gdk/gdktestutils.h * gtk/gtkmountoperation.h * gtk/gtkshow.h * gtk/gtktestutils.h * gtk/gtktoolshell.h: no need to allow disabling single includes conditionally in these new files. Simply forbid including them individually from the beginning. svn path=/trunk/; revision=20256
-rw-r--r--ChangeLog2
-rw-r--r--gdk/gdkapplaunchcontext.h2
-rw-r--r--gdk/gdktestutils.h2
3 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index cd1e16857d..ba5422e4ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2008-05-30 Michael Natterer <mitch@imendio.com>
+ * gdk/gdkapplaunchcontext.h
+ * gdk/gdktestutils.h
* gtk/gtkmountoperation.h
* gtk/gtkshow.h
* gtk/gtktestutils.h
diff --git a/gdk/gdkapplaunchcontext.h b/gdk/gdkapplaunchcontext.h
index 31b473070d..7b0cf9ad7e 100644
--- a/gdk/gdkapplaunchcontext.h
+++ b/gdk/gdkapplaunchcontext.h
@@ -20,7 +20,7 @@
Author: Alexander Larsson <alexl@redhat.com>
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif
diff --git a/gdk/gdktestutils.h b/gdk/gdktestutils.h
index fb13886ad8..e9762a4b9d 100644
--- a/gdk/gdktestutils.h
+++ b/gdk/gdktestutils.h
@@ -18,7 +18,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif