diff options
| author | Richard Hughes <richard@hughsie.com> | 2012-06-27 09:00:15 +0100 |
|---|---|---|
| committer | Richard Hughes <richard@hughsie.com> | 2012-06-27 09:00:15 +0100 |
| commit | 71510fc785e440c068cc42dbd294dba5d74eeaff (patch) | |
| tree | bb3f80487c2071fd32b53399772660cac9c06cce | |
| parent | c2517f5d4027d706f8c6c9ad86b31125e7ebdd70 (diff) | |
| download | colord-gtk-71510fc785e440c068cc42dbd294dba5d74eeaff.tar.gz | |
Do not reuse __COLORD_H_INSIDE__ as this causes #include insanity
| -rw-r--r-- | libcolord-gtk/cd-version.h.in | 2 | ||||
| -rw-r--r-- | libcolord-gtk/cd-window-sync.h | 2 | ||||
| -rw-r--r-- | libcolord-gtk/cd-window.h | 2 | ||||
| -rw-r--r-- | libcolord-gtk/colord-gtk.h | 9 |
4 files changed, 6 insertions, 9 deletions
diff --git a/libcolord-gtk/cd-version.h.in b/libcolord-gtk/cd-version.h.in index 5ad7569..555556a 100644 --- a/libcolord-gtk/cd-version.h.in +++ b/libcolord-gtk/cd-version.h.in @@ -29,7 +29,7 @@ * See also: #CdClient, #CdDevice */ -#if !defined (__COLORD_H_INSIDE__) && !defined (CD_COMPILATION) +#if !defined (__COLORD_GTK_H_INSIDE__) && !defined (CD_COMPILATION) #error "Only <colord.h> can be included directly." #endif diff --git a/libcolord-gtk/cd-window-sync.h b/libcolord-gtk/cd-window-sync.h index 6afe83b..47b8254 100644 --- a/libcolord-gtk/cd-window-sync.h +++ b/libcolord-gtk/cd-window-sync.h @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#if !defined (__COLORD_H_INSIDE__) && !defined (CD_COMPILATION) +#if !defined (__COLORD_GTK_H_INSIDE__) && !defined (CD_COMPILATION) #error "Only <colord.h> can be included directly." #endif diff --git a/libcolord-gtk/cd-window.h b/libcolord-gtk/cd-window.h index 3b993a8..dbdab3e 100644 --- a/libcolord-gtk/cd-window.h +++ b/libcolord-gtk/cd-window.h @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#if !defined (__COLORD_H_INSIDE__) && !defined (CD_COMPILATION) +#if !defined (__COLORD_GTK_H_INSIDE__) && !defined (CD_COMPILATION) #error "Only <colord-gtk.h> can be included directly." #endif diff --git a/libcolord-gtk/colord-gtk.h b/libcolord-gtk/colord-gtk.h index 658ec60..4080667 100644 --- a/libcolord-gtk/colord-gtk.h +++ b/libcolord-gtk/colord-gtk.h @@ -31,20 +31,17 @@ #ifndef __COLORD_GTK_H__ #define __COLORD_GTK_H__ -#define __COLORD_H_INSIDE__ +#define __COLORD_GTK_H_INSIDE__ #include <gtk/gtk.h> - #include <colord.h> -//#include <colord/cd-device.h> -//#include <colord/cd-profile.h> -//#include <colord/cd-color.h> + #include <colord-gtk/cd-sample-window.h> #include <colord-gtk/cd-version.h> #include <colord-gtk/cd-window.h> #include <colord-gtk/cd-window-sync.h> -#undef __COLORD_H_INSIDE__ +#undef __COLORD_GTK_H_INSIDE__ #endif /* __COLORD_GTK_H__ */ |