[gdk-pixbuf] Move single-include guards inside include guards



commit 28d8d0a72ad4f1ebaddfede9497210d08540408b
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Dec 28 00:18:58 2012 -0500

    Move single-include guards inside include guards
    
    gcc has optimizations for include guards that only work
    if they are outermost in the the header.
    https://bugzilla.gnome.org/show_bug.cgi?id=689810

 gdk-pixbuf/gdk-pixbuf-animation.h   |    6 +++---
 gdk-pixbuf/gdk-pixbuf-core.h        |    6 +++---
 gdk-pixbuf/gdk-pixbuf-io.h          |    6 +++---
 gdk-pixbuf/gdk-pixbuf-loader.h      |    6 +++---
 gdk-pixbuf/gdk-pixbuf-simple-anim.h |    6 +++---
 gdk-pixbuf/gdk-pixbuf-transform.h   |    6 +++---
 6 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/gdk-pixbuf/gdk-pixbuf-animation.h b/gdk-pixbuf/gdk-pixbuf-animation.h
index 8213e94..1f0c00f 100644
--- a/gdk-pixbuf/gdk-pixbuf-animation.h
+++ b/gdk-pixbuf/gdk-pixbuf-animation.h
@@ -24,13 +24,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef GDK_PIXBUF_ANIMATION_H
+#define GDK_PIXBUF_ANIMATION_H
+
 #if defined(GDK_PIXBUF_DISABLE_SINGLE_INCLUDES) && !defined (GDK_PIXBUF_H_INSIDE) && !defined (GDK_PIXBUF_COMPILATION)
 #error "Only <gdk-pixbuf/gdk-pixbuf.h> can be included directly."
 #endif
 
-#ifndef GDK_PIXBUF_ANIMATION_H
-#define GDK_PIXBUF_ANIMATION_H
-
 #include <glib-object.h>
 #include <gdk-pixbuf/gdk-pixbuf-core.h>
 
diff --git a/gdk-pixbuf/gdk-pixbuf-core.h b/gdk-pixbuf/gdk-pixbuf-core.h
index d777286..eb4d0a1 100644
--- a/gdk-pixbuf/gdk-pixbuf-core.h
+++ b/gdk-pixbuf/gdk-pixbuf-core.h
@@ -23,13 +23,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef GDK_PIXBUF_CORE_H
+#define GDK_PIXBUF_CORE_H
+
 #if defined(GDK_PIXBUF_DISABLE_SINGLE_INCLUDES) && !defined (GDK_PIXBUF_H_INSIDE) && !defined (GDK_PIXBUF_COMPILATION)
 #error "Only <gdk-pixbuf/gdk-pixbuf.h> can be included directly."
 #endif
 
-#ifndef GDK_PIXBUF_CORE_H
-#define GDK_PIXBUF_CORE_H
-
 #include <glib.h>
 #include <glib-object.h>
 #include <gio/gio.h>
diff --git a/gdk-pixbuf/gdk-pixbuf-io.h b/gdk-pixbuf/gdk-pixbuf-io.h
index 41a99e4..3d151dd 100644
--- a/gdk-pixbuf/gdk-pixbuf-io.h
+++ b/gdk-pixbuf/gdk-pixbuf-io.h
@@ -26,13 +26,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef GDK_PIXBUF_IO_H
+#define GDK_PIXBUF_IO_H
+
 #if defined(GDK_PIXBUF_DISABLE_SINGLE_INCLUDES) && !defined (GDK_PIXBUF_H_INSIDE) && !defined (GDK_PIXBUF_COMPILATION)
 #error "Only <gdk-pixbuf/gdk-pixbuf.h> can be included directly."
 #endif
 
-#ifndef GDK_PIXBUF_IO_H
-#define GDK_PIXBUF_IO_H
-
 #include <stdio.h>
 #include <glib.h>
 #include <gmodule.h>
diff --git a/gdk-pixbuf/gdk-pixbuf-loader.h b/gdk-pixbuf/gdk-pixbuf-loader.h
index f9743ee..c9a1612 100644
--- a/gdk-pixbuf/gdk-pixbuf-loader.h
+++ b/gdk-pixbuf/gdk-pixbuf-loader.h
@@ -23,13 +23,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef GDK_PIXBUF_LOADER_H
+#define GDK_PIXBUF_LOADER_H
+
 #if defined(GDK_PIXBUF_DISABLE_SINGLE_INCLUDES) && !defined (GDK_PIXBUF_H_INSIDE) && !defined (GDK_PIXBUF_COMPILATION)
 #error "Only <gdk-pixbuf/gdk-pixbuf.h> can be included directly."
 #endif
 
-#ifndef GDK_PIXBUF_LOADER_H
-#define GDK_PIXBUF_LOADER_H
-
 #include <glib.h>
 #include <glib-object.h>
 #include <gdk-pixbuf/gdk-pixbuf-core.h>
diff --git a/gdk-pixbuf/gdk-pixbuf-simple-anim.h b/gdk-pixbuf/gdk-pixbuf-simple-anim.h
index 496688f..d7c82f9 100644
--- a/gdk-pixbuf/gdk-pixbuf-simple-anim.h
+++ b/gdk-pixbuf/gdk-pixbuf-simple-anim.h
@@ -21,13 +21,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef GDK_PIXBUF_SIMPLE_ANIM_H
+#define GDK_PIXBUF_SIMPLE_ANIM_H
+
 #if defined(GDK_PIXBUF_DISABLE_SINGLE_INCLUDES) && !defined (GDK_PIXBUF_H_INSIDE) && !defined (GDK_PIXBUF_COMPILATION)
 #error "Only <gdk-pixbuf/gdk-pixbuf.h> can be included directly."
 #endif
 
-#ifndef GDK_PIXBUF_SIMPLE_ANIM_H
-#define GDK_PIXBUF_SIMPLE_ANIM_H
-
 #include <gdk-pixbuf/gdk-pixbuf-animation.h>
 
 G_BEGIN_DECLS
diff --git a/gdk-pixbuf/gdk-pixbuf-transform.h b/gdk-pixbuf/gdk-pixbuf-transform.h
index d4757ff..de3a48f 100644
--- a/gdk-pixbuf/gdk-pixbuf-transform.h
+++ b/gdk-pixbuf/gdk-pixbuf-transform.h
@@ -23,13 +23,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef GDK_PIXBUF_TRANSFORM_H
+#define GDK_PIXBUF_TRANSFORM_H
+
 #if defined(GDK_PIXBUF_DISABLE_SINGLE_INCLUDES) && !defined (GDK_PIXBUF_H_INSIDE) && !defined (GDK_PIXBUF_COMPILATION)
 #error "Only <gdk-pixbuf/gdk-pixbuf.h> can be included directly."
 #endif
 
-#ifndef GDK_PIXBUF_TRANSFORM_H
-#define GDK_PIXBUF_TRANSFORM_H
-
 #include <glib.h>
 #include <gdk-pixbuf/gdk-pixbuf-core.h>
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]