summaryrefslogtreecommitdiff
path: root/gdk
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2014-12-08 19:31:56 -0500
committerMatthias Clasen <mclasen@redhat.com>2014-12-08 19:31:56 -0500
commit4f96353964a2012f03a7b736c0c84967c8310394 (patch)
tree1891ad93eca0d7fac1030fce4b07e7e8ac07b280 /gdk
parent2d6ae59d7f0d1bf396e7544d7f211f26bebba074 (diff)
downloadgtk+-4f96353964a2012f03a7b736c0c84967c8310394.tar.gz
Fix some oversights with header guards
Pointed out in https://bugzilla.gnome.org/show_bug.cgi?id=741254
Diffstat (limited to 'gdk')
-rw-r--r--gdk/broadway/gdkeventsource.h6
-rw-r--r--gdk/gdkenumtypes.h.template6
-rw-r--r--gdk/gdkframeclock.h6
-rw-r--r--gdk/gdkframetimings.h6
-rw-r--r--gdk/x11/gdkeventsource.h6
5 files changed, 15 insertions, 15 deletions
diff --git a/gdk/broadway/gdkeventsource.h b/gdk/broadway/gdkeventsource.h
index f44df5a852..073b18b3c0 100644
--- a/gdk/broadway/gdkeventsource.h
+++ b/gdk/broadway/gdkeventsource.h
@@ -15,8 +15,8 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __GDK_EVENT_SOURCE_H__
-#define __GDK_EVENT_SOURCE_H__
+#ifndef __GDK_BROADWAY_EVENT_SOURCE_H__
+#define __GDK_BROADWAY_EVENT_SOURCE_H__
#include "gdkprivate-broadway.h"
@@ -29,4 +29,4 @@ GSource * _gdk_broadway_event_source_new (GdkDisplay *display);
G_END_DECLS
-#endif /* __GDK_EVENT_SOURCE_H__ */
+#endif /* __GDK_BROADWAY_EVENT_SOURCE_H__ */
diff --git a/gdk/gdkenumtypes.h.template b/gdk/gdkenumtypes.h.template
index 49ee8b4321..0bc4a71033 100644
--- a/gdk/gdkenumtypes.h.template
+++ b/gdk/gdkenumtypes.h.template
@@ -1,11 +1,11 @@
/*** BEGIN file-header ***/
+#ifndef __GDK_ENUM_TYPES_H__
+#define __GDK_ENUM_TYPES_H__
+
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif
-#ifndef __GDK_ENUM_TYPES_H__
-#define __GDK_ENUM_TYPES_H__
-
#include <glib-object.h>
#include <gdk/gdkversionmacros.h>
diff --git a/gdk/gdkframeclock.h b/gdk/gdkframeclock.h
index 951cc8a6f0..6d7d94d135 100644
--- a/gdk/gdkframeclock.h
+++ b/gdk/gdkframeclock.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_FRAME_CLOCK_H__
+#define __GDK_FRAME_CLOCK_H__
+
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif
-#ifndef __GDK_FRAME_CLOCK_H__
-#define __GDK_FRAME_CLOCK_H__
-
#include <gdk/gdkframetimings.h>
G_BEGIN_DECLS
diff --git a/gdk/gdkframetimings.h b/gdk/gdkframetimings.h
index b345667b9c..93db908a50 100644
--- a/gdk/gdkframetimings.h
+++ b/gdk/gdkframetimings.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_FRAME_TIMINGS_H__
+#define __GDK_FRAME_TIMINGS_H__
+
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif
-#ifndef __GDK_FRAME_TIMINGS_H__
-#define __GDK_FRAME_TIMINGS_H__
-
#include <glib-object.h>
#include <gdk/gdkversionmacros.h>
diff --git a/gdk/x11/gdkeventsource.h b/gdk/x11/gdkeventsource.h
index ed309c79be..8338fddfcb 100644
--- a/gdk/x11/gdkeventsource.h
+++ b/gdk/x11/gdkeventsource.h
@@ -15,8 +15,8 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __GDK_EVENT_SOURCE_H__
-#define __GDK_EVENT_SOURCE_H__
+#ifndef __GDK_X11_EVENT_SOURCE_H__
+#define __GDK_X11_EVENT_SOURCE_H__
#include "gdkeventtranslator.h"
@@ -40,4 +40,4 @@ void gdk_x11_event_source_select_events (GdkEventSource *source,
G_END_DECLS
-#endif /* __GDK_EVENT_SOURCE_H__ */
+#endif /* __GDK_X11_EVENT_SOURCE_H__ */