GNOME.org
 

[gnome-color-manager: 62/80] trivial; fix up some of the header guards in libcolor-glib

commit acc08bee943d7832bf1a0c02d13bf11162f5bc62
Author: Richard Hughes <richard hughsie com>
Date:   Sun Jul 18 12:42:26 2010 +0100

    trivial; fix up some of the header guards in libcolor-glib

 libcolor-glib/Makefile.am       |    6 +++---
 libcolor-glib/gcm-clut.h        |    4 ++++
 libcolor-glib/gcm-common.h      |    4 ++--
 libcolor-glib/gcm-ddc-client.h  |    4 ++--
 libcolor-glib/gcm-ddc-common.h  |    4 ++--
 libcolor-glib/gcm-ddc-control.h |    4 ++--
 libcolor-glib/gcm-ddc-device.h  |    4 ++--
 libcolor-glib/gcm-edid.h        |    4 ++++
 libcolor-glib/gcm-profile.h     |    4 ++++
 libcolor-glib/gcm-sensor-huey.h |    4 ++++
 libcolor-glib/gcm-sensor.h      |    4 ++++
 libcolor-glib/gcm-tables.h      |    4 ++++
 libcolor-glib/gcm-version.h.in  |    4 ++--
 libcolor-glib/gcm-xyz.h         |    4 ++++
 libcolor-glib/libcolor-glib.h   |    8 ++++----
 src/Makefile.am                 |    3 ++-
 16 files changed, 49 insertions(+), 20 deletions(-)
---
diff --git a/libcolor-glib/Makefile.am b/libcolor-glib/Makefile.am
index b614ed5..3cb4437 100644
--- a/libcolor-glib/Makefile.am
+++ b/libcolor-glib/Makefile.am
@@ -12,10 +12,10 @@ INCLUDES = \
 	-I$(top_srcdir)/libcolor-glib				\
 	-I$(top_builddir)/libcolor-glib				\
 	-I.							\
-	-DGCM_COMPILATION					\
+	-DLIBCOLOR_GLIB_COMPILATION				\
 	-DLOCALSTATEDIR=\""$(localstatedir)"\" 			\
 	-DTESTDATADIR=\""$(top_srcdir)/data/tests"\"		\
-	-DI_KNOW_THE_GCM_GLIB_API_IS_SUBJECT_TO_CHANGE		\
+	-DI_KNOW_THE_LIBCOLOR_GLIB_API_IS_SUBJECT_TO_CHANGE	\
 	-DPACKAGE_DATA_DIR=\""$(datadir)"\"			\
 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
 
@@ -122,7 +122,7 @@ introspection_sources = $(libcolor_glib_la_SOURCES)
 
 gcmGlib-1.0.gir: libcolor-glib.la
 gcmGlib_1_0_gir_INCLUDES = GObject-2.0
-gcmGlib_1_0_gir_CFLAGS = $(INCLUDES) -DI_KNOW_THE_GCM_GLIB_API_IS_SUBJECT_TO_CHANGE
+gcmGlib_1_0_gir_CFLAGS = $(INCLUDES) -DI_KNOW_THE_LIBCOLOR_GLIB_API_IS_SUBJECT_TO_CHANGE
 gcmGlib_1_0_gir_LIBS = libcolor-glib.la
 gcmGlib_1_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
 INTROSPECTION_GIRS += gcmGlib-1.0.gir
diff --git a/libcolor-glib/gcm-clut.h b/libcolor-glib/gcm-clut.h
index e589735..cd4c161 100644
--- a/libcolor-glib/gcm-clut.h
+++ b/libcolor-glib/gcm-clut.h
@@ -19,6 +19,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#if !defined (__LIBCOLOR_GLIB_H_INSIDE__) && !defined (LIBCOLOR_GLIB_COMPILATION)
+#error "Only <libcolor-glib.h> can be included directly."
+#endif
+
 #ifndef __GCM_CLUT_H
 #define __GCM_CLUT_H
 
diff --git a/libcolor-glib/gcm-common.h b/libcolor-glib/gcm-common.h
index 21c65bd..80c3ef2 100644
--- a/libcolor-glib/gcm-common.h
+++ b/libcolor-glib/gcm-common.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#if !defined (__GCM_H_INSIDE__) && !defined (GCM_COMPILATION)
-#error "Only <gcm.h> can be included directly."
+#if !defined (__LIBCOLOR_GLIB_H_INSIDE__) && !defined (LIBCOLOR_GLIB_COMPILATION)
+#error "Only <libcolor-glib.h> can be included directly."
 #endif
 
 #ifndef __GCM_COMMON_H__
diff --git a/libcolor-glib/gcm-ddc-client.h b/libcolor-glib/gcm-ddc-client.h
index 736f88c..b4d826c 100644
--- a/libcolor-glib/gcm-ddc-client.h
+++ b/libcolor-glib/gcm-ddc-client.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#if !defined (__GCM_H_INSIDE__) && !defined (GCM_COMPILATION)
-#error "Only <gcm.h> can be included directly."
+#if !defined (__LIBCOLOR_GLIB_H_INSIDE__) && !defined (LIBCOLOR_GLIB_COMPILATION)
+#error "Only <libcolor-glib.h> can be included directly."
 #endif
 
 #ifndef __GCM_DDC_CLIENT_H
diff --git a/libcolor-glib/gcm-ddc-common.h b/libcolor-glib/gcm-ddc-common.h
index 9aea474..3aec3b6 100644
--- a/libcolor-glib/gcm-ddc-common.h
+++ b/libcolor-glib/gcm-ddc-common.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#if !defined (__GCM_H_INSIDE__) && !defined (GCM_COMPILATION)
-#error "Only <gcm.h> can be included directly."
+#if !defined (__LIBCOLOR_GLIB_H_INSIDE__) && !defined (LIBCOLOR_GLIB_COMPILATION)
+#error "Only <libcolor-glib.h> can be included directly."
 #endif
 
 #ifndef __GCM_DDC_COMMON_H__
diff --git a/libcolor-glib/gcm-ddc-control.h b/libcolor-glib/gcm-ddc-control.h
index eb7e036..75ca1a7 100644
--- a/libcolor-glib/gcm-ddc-control.h
+++ b/libcolor-glib/gcm-ddc-control.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#if !defined (__GCM_H_INSIDE__) && !defined (GCM_COMPILATION)
-#error "Only <gcm.h> can be included directly."
+#if !defined (__LIBCOLOR_GLIB_H_INSIDE__) && !defined (LIBCOLOR_GLIB_COMPILATION)
+#error "Only <libcolor-glib.h> can be included directly."
 #endif
 
 #ifndef __GCM_DDC_CONTROL_H
diff --git a/libcolor-glib/gcm-ddc-device.h b/libcolor-glib/gcm-ddc-device.h
index bc7b507..c6e60c8 100644
--- a/libcolor-glib/gcm-ddc-device.h
+++ b/libcolor-glib/gcm-ddc-device.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#if !defined (__GCM_H_INSIDE__) && !defined (GCM_COMPILATION)
-#error "Only <gcm.h> can be included directly."
+#if !defined (__LIBCOLOR_GLIB_H_INSIDE__) && !defined (LIBCOLOR_GLIB_COMPILATION)
+#error "Only <libcolor-glib.h> can be included directly."
 #endif
 
 #ifndef __GCM_DDC_DEVICE_H
diff --git a/libcolor-glib/gcm-edid.h b/libcolor-glib/gcm-edid.h
index 35423ce..e650203 100644
--- a/libcolor-glib/gcm-edid.h
+++ b/libcolor-glib/gcm-edid.h
@@ -19,6 +19,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#if !defined (__LIBCOLOR_GLIB_H_INSIDE__) && !defined (LIBCOLOR_GLIB_COMPILATION)
+#error "Only <libcolor-glib.h> can be included directly."
+#endif
+
 #ifndef __GCM_EDID_H
 #define __GCM_EDID_H
 
diff --git a/libcolor-glib/gcm-profile.h b/libcolor-glib/gcm-profile.h
index 0a46897..d4c3029 100644
--- a/libcolor-glib/gcm-profile.h
+++ b/libcolor-glib/gcm-profile.h
@@ -19,6 +19,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#if !defined (__LIBCOLOR_GLIB_H_INSIDE__) && !defined (LIBCOLOR_GLIB_COMPILATION)
+#error "Only <libcolor-glib.h> can be included directly."
+#endif
+
 #ifndef __GCM_PROFILE_H
 #define __GCM_PROFILE_H
 
diff --git a/libcolor-glib/gcm-sensor-huey.h b/libcolor-glib/gcm-sensor-huey.h
index 4e4d535..70c1306 100644
--- a/libcolor-glib/gcm-sensor-huey.h
+++ b/libcolor-glib/gcm-sensor-huey.h
@@ -19,6 +19,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#if !defined (__LIBCOLOR_GLIB_H_INSIDE__) && !defined (LIBCOLOR_GLIB_COMPILATION)
+#error "Only <libcolor-glib.h> can be included directly."
+#endif
+
 #ifndef __GCM_SENSOR_HUEY_H
 #define __GCM_SENSOR_HUEY_H
 
diff --git a/libcolor-glib/gcm-sensor.h b/libcolor-glib/gcm-sensor.h
index 0a90f5a..aacae2c 100644
--- a/libcolor-glib/gcm-sensor.h
+++ b/libcolor-glib/gcm-sensor.h
@@ -19,6 +19,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#if !defined (__LIBCOLOR_GLIB_H_INSIDE__) && !defined (LIBCOLOR_GLIB_COMPILATION)
+#error "Only <libcolor-glib.h> can be included directly."
+#endif
+
 #ifndef __GCM_SENSOR_H
 #define __GCM_SENSOR_H
 
diff --git a/libcolor-glib/gcm-tables.h b/libcolor-glib/gcm-tables.h
index 3d6cd35..b3d30b7 100644
--- a/libcolor-glib/gcm-tables.h
+++ b/libcolor-glib/gcm-tables.h
@@ -19,6 +19,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#if !defined (__LIBCOLOR_GLIB_H_INSIDE__) && !defined (LIBCOLOR_GLIB_COMPILATION)
+#error "Only <libcolor-glib.h> can be included directly."
+#endif
+
 #ifndef __GCM_TABLES_H
 #define __GCM_TABLES_H
 
diff --git a/libcolor-glib/gcm-version.h.in b/libcolor-glib/gcm-version.h.in
index a61a7fd..c890d03 100644
--- a/libcolor-glib/gcm-version.h.in
+++ b/libcolor-glib/gcm-version.h.in
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#if !defined (__GCM_H_INSIDE__) && !defined (GCM_COMPILATION)
-#error "Only <gcm.h> can be included directly."
+#if !defined (__LIBCOLOR_GLIB_H_INSIDE__) && !defined (LIBCOLOR_GLIB_COMPILATION)
+#error "Only <libcolor-glib.h> can be included directly."
 #endif
 
 #ifndef __GCM_VERSION_H
diff --git a/libcolor-glib/gcm-xyz.h b/libcolor-glib/gcm-xyz.h
index 7fd15a1..60a2d80 100644
--- a/libcolor-glib/gcm-xyz.h
+++ b/libcolor-glib/gcm-xyz.h
@@ -19,6 +19,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#if !defined (__LIBCOLOR_GLIB_H_INSIDE__) && !defined (LIBCOLOR_GLIB_COMPILATION)
+#error "Only <libcolor-glib.h> can be included directly."
+#endif
+
 #ifndef __GCM_XYZ_H
 #define __GCM_XYZ_H
 
diff --git a/libcolor-glib/libcolor-glib.h b/libcolor-glib/libcolor-glib.h
index 351f642..06f49b5 100644
--- a/libcolor-glib/libcolor-glib.h
+++ b/libcolor-glib/libcolor-glib.h
@@ -22,11 +22,11 @@
 #ifndef __LIBCOLOR_GLIB_H__
 #define __LIBCOLOR_GLIB_H__
 
-#ifndef I_KNOW_THE_GCM_GLIB_API_IS_SUBJECT_TO_CHANGE
-#error You have to define I_KNOW_THE_GCM_GLIB_API_IS_SUBJECT_TO_CHANGE
+#ifndef I_KNOW_THE_LIBCOLOR_GLIB_API_IS_SUBJECT_TO_CHANGE
+#error You have to define I_KNOW_THE_LIBCOLOR_GLIB_API_IS_SUBJECT_TO_CHANGE
 #endif
 
-#define __GCM_H_INSIDE__
+#define __LIBCOLOR_GLIB_H_INSIDE__
 
 #include <gcm-common.h>
 #include <gcm-ddc-common.h>
@@ -41,7 +41,7 @@
 #include <gcm-enum.h>
 #include <gcm-clut.h>
 
-#undef __GCM_H_INSIDE__
+#undef __LIBCOLOR_GLIB_H_INSIDE__
 
 #endif /* __LIBCOLOR_GLIB_H__ */
 
diff --git a/src/Makefile.am b/src/Makefile.am
index accafd7..c9e027b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,6 +17,7 @@ INCLUDES =						\
 	-DGNOME_DESKTOP_USE_UNSTABLE_API		\
 	$(GUDEV_CFLAGS)					\
 	-I$(top_srcdir)/libcolor-glib			\
+	-DLIBCOLOR_GLIB_COMPILATION			\
 	-DBINDIR=\"$(bindir)\"				\
 	-DLIBEXECDIR=\"$(libexecdir)\"			\
 	-DSBINDIR=\"$(sbindir)\"			\
@@ -26,7 +27,7 @@ INCLUDES =						\
 	-DLOCALEDIR=\""$(localedir)"\"			\
 	-DTESTDATADIR=\""$(top_srcdir)/data/tests"\"	\
 	-DGCM_SYSTEM_PROFILES_DIR="\"$(GCM_SYSTEM_PROFILES_DIR)"\" \
-	-DI_KNOW_THE_GCM_GLIB_API_IS_SUBJECT_TO_CHANGE	\
+	-DI_KNOW_THE_LIBCOLOR_GLIB_API_IS_SUBJECT_TO_CHANGE	\
 	-DGCM_DATA=\"$(pkgdatadir)\"
 
 introspectiondir = $(datadir)/dbus-1/interfaces
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]