diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2010-05-06 22:55:02 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2010-05-06 22:55:02 -0400 |
| commit | 77d4d3cdae0739c0a5643fb23891f8790f05c074 (patch) | |
| tree | ebd134deb99ffd0ef47aea63e3dfcea73bd625f5 /gtk/gtkimmulticontext.h | |
| parent | b3e0e25d65db6b7be3385663ceeaecdc5c3115df (diff) | |
| parent | 0de8601327d541f644dc1882c99f44551870a7ab (diff) | |
| download | gtk+-77d4d3cdae0739c0a5643fb23891f8790f05c074.tar.gz | |
Merge branch 'gtk-2-90'
Conflicts:
gtk/gtkentry.h
Diffstat (limited to 'gtk/gtkimmulticontext.h')
| -rw-r--r-- | gtk/gtkimmulticontext.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk/gtkimmulticontext.h b/gtk/gtkimmulticontext.h index 951ddae266..418a9327f7 100644 --- a/gtk/gtkimmulticontext.h +++ b/gtk/gtkimmulticontext.h @@ -17,7 +17,7 @@ * Boston, MA 02111-1307, USA. */ -#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gtk/gtk.h> can be included directly." #endif |