diff options
| author | Federico Mena Quintero <federico@gnome.org> | 2013-02-13 20:15:46 -0600 |
|---|---|---|
| committer | Federico Mena Quintero <federico@gnome.org> | 2013-02-13 20:37:36 -0600 |
| commit | 936045e82bc9a3f2b09612e3c22799c45b101c5e (patch) | |
| tree | e4cda00f3d42e8840b11dfa5317a92cf63dcd6a6 /gtk/gtkmodules.h | |
| parent | 04dbec41913bcfe5b627869ab7c8c3b0797ddd72 (diff) | |
| parent | e16ade9836a9ad2a5a4ad568ccd9ed6ed2d7f62d (diff) | |
| download | gtk+-936045e82bc9a3f2b09612e3c22799c45b101c5e.tar.gz | |
Merge branch 'master' into places-sidebar
Conflicts:
docs/reference/gtk/gtk-docs.sgml
gtk/gtkfilechooserdefault.c
gtk/org.gtk.Settings.FileChooser.gschema.xml
Diffstat (limited to 'gtk/gtkmodules.h')
| -rw-r--r-- | gtk/gtkmodules.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk/gtkmodules.h b/gtk/gtkmodules.h index 594f99e1df..4aca3606ea 100644 --- a/gtk/gtkmodules.h +++ b/gtk/gtkmodules.h @@ -16,13 +16,13 @@ * License along with this library. If not, see <http://www.gnu.org/licenses/>. */ +#ifndef __GTK_MODULES_H__ +#define __GTK_MODULES_H__ + #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gtk/gtk.h> can be included directly." #endif -#ifndef __GTK_MODULES_H__ -#define __GTK_MODULES_H__ - #include <gdk/gdk.h> G_BEGIN_DECLS |