Use a single compilation symbol

We use a compilation symbol in our build to allow the inclusion of
specific headers while building GTK, to avoid the need to include only
the global header.

Each namespace has its own compilation symbol because we used to have
different libraries, and strict symbol visibility between libraries;
now that we have a single library, and we can use private symbols across
namespaces while building GTK, we should have a single compilation
symbol, and simplify the build rules.

12 files changed, 18 insertions, 18 deletions

diff --git a/gdk/quartz/gdkquartzcursor.h b/gdk/quartz/gdkquartzcursor.h
index 0938eeb065..d8668b8925 100644
--- a/gdk/quartz/gdkquartzcursor.h
+++ b/gdk/quartz/gdkquartzcursor.h
@@ -20,7 +20,7 @@
 #ifndef __GDK_QUARTZ_CURSOR_H__
 #define __GDK_QUARTZ_CURSOR_H__
 
-#if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/quartz/gdkquartz.h> can be included directly."
 #endif
 
@@ -35,7 +35,7 @@ G_BEGIN_DECLS
 #define GDK_IS_QUARTZ_CURSOR_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_QUARTZ_CURSOR))
 #define GDK_QUARTZ_CURSOR_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_QUARTZ_CURSOR, GdkQuartzCursorClass))
 
-#ifdef GDK_COMPILATION
+#ifdef GTK_COMPILATION
 typedef struct _GdkQuartzCursor GdkQuartzCursor;
 #else
 typedef GdkCursor GdkQuartzCursor;
diff --git a/gdk/quartz/gdkquartzdevice-core.h b/gdk/quartz/gdkquartzdevice-core.h
index 9b320f60b7..4b88a0b555 100644
--- a/gdk/quartz/gdkquartzdevice-core.h
+++ b/gdk/quartz/gdkquartzdevice-core.h
@@ -18,7 +18,7 @@
 #ifndef __GDK_QUARTZ_DEVICE_CORE_H__
 #define __GDK_QUARTZ_DEVICE_CORE_H__
 
-#if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/quartz/gdkquartz.h> can be included directly."
 #endif
 
diff --git a/gdk/quartz/gdkquartzdevicemanager-core.h b/gdk/quartz/gdkquartzdevicemanager-core.h
index 8ab4966cc1..308152ce0e 100644
--- a/gdk/quartz/gdkquartzdevicemanager-core.h
+++ b/gdk/quartz/gdkquartzdevicemanager-core.h
@@ -18,7 +18,7 @@
 #ifndef __GDK_QUARTZ_DEVICE_MANAGER_CORE_H__
 #define __GDK_QUARTZ_DEVICE_MANAGER_CORE_H__
 
-#if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/quartz/gdkquartz.h> can be included directly."
 #endif
 
diff --git a/gdk/quartz/gdkquartzdisplay.h b/gdk/quartz/gdkquartzdisplay.h
index ce709a6b3f..23ed898d54 100644
--- a/gdk/quartz/gdkquartzdisplay.h
+++ b/gdk/quartz/gdkquartzdisplay.h
@@ -20,7 +20,7 @@
 #ifndef __GDK_QUARTZ_DISPLAY_H__
 #define __GDK_QUARTZ_DISPLAY_H__
 
-#if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/quartz/gdkquartz.h> can be included directly."
 #endif
 
@@ -35,7 +35,7 @@ G_BEGIN_DECLS
 #define GDK_IS_QUARTZ_DISPLAY_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_QUARTZ_DISPLAY))
 #define GDK_QUARTZ_DISPLAY_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_QUARTZ_DISPLAY, GdkQuartzDisplayClass))
 
-#ifdef GDK_COMPILATION
+#ifdef GTK_COMPILATION
 typedef struct _GdkQuartzDisplay GdkQuartzDisplay;
 #else
 typedef GdkDisplay GdkQuartzDisplay;
diff --git a/gdk/quartz/gdkquartzdisplaymanager.h b/gdk/quartz/gdkquartzdisplaymanager.h
index 38fc822cbb..8aa1938304 100644
--- a/gdk/quartz/gdkquartzdisplaymanager.h
+++ b/gdk/quartz/gdkquartzdisplaymanager.h
@@ -20,7 +20,7 @@
 #ifndef __GDK_QUARTZ_DISPLAY_MANAGER_H__
 #define __GDK_QUARTZ_DISPLAY_MANAGER_H__
 
-#if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/quartz/gdkquartz.h> can be included directly."
 #endif
 
@@ -31,7 +31,7 @@ G_BEGIN_DECLS
 #define GDK_TYPE_QUARTZ_DISPLAY_MANAGER    (gdk_quartz_display_manager_get_type ())
 #define GDK_QUARTZ_DISPLAY_MANAGER(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_QUARTZ_DISPLAY_MANAGER, GdkQuartzDisplayManager))
 
-#ifdef GDK_COMPILATION
+#ifdef GTK_COMPILATION
 typedef struct _GdkQuartzDisplayManager GdkQuartzDisplayManager;
 #else
 typedef GdkDisplayManager _GdkQuartzDisplayManager;
diff --git a/gdk/quartz/gdkquartzdnd.h b/gdk/quartz/gdkquartzdnd.h
index d1a618d134..18f3727c59 100644
--- a/gdk/quartz/gdkquartzdnd.h
+++ b/gdk/quartz/gdkquartzdnd.h
@@ -19,7 +19,7 @@
 #ifndef __GDK_QUARTZ_DND_H__
 #define __GDK_QUARTZ_DND_H__
 
-#if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/quartz/gdkquartz.h> can be included directly."
 #endif
 
@@ -34,7 +34,7 @@ G_BEGIN_DECLS
 #define GDK_IS_QUARTZ_DRAG_CONTEXT_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_QUARTZ_DRAG_CONTEXT))
 #define GDK_QUARTZ_DRAG_CONTEXT_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_QUARTZ_DRAG_CONTEXT, GdkQuartzDragContextClass))
 
-#ifdef GDK_COMPILATION
+#ifdef GTK_COMPILATION
 typedef struct _GdkQuartzDragContext GdkQuartzDragContext;
 #else
 typedef GdkDragContext GdkQuartzDragContext;
diff --git a/gdk/quartz/gdkquartzkeys.h b/gdk/quartz/gdkquartzkeys.h
index 86fe6580bf..9325b95b01 100644
--- a/gdk/quartz/gdkquartzkeys.h
+++ b/gdk/quartz/gdkquartzkeys.h
@@ -20,7 +20,7 @@
 #ifndef __GDK_QUARTZ_KEYS_H__
 #define __GDK_QUARTZ_KEYS_H__
 
-#if !defined (__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDKQUARTZ_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/quartz/gdkquartz.h> can be included directly."
 #endif
 
@@ -35,7 +35,7 @@ G_BEGIN_DECLS
 #define GDK_IS_QUARTZ_KEYMAP_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_QUARTZ_KEYMAP))
 #define GDK_QUARTZ_KEYMAP_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_QUARTZ_KEYMAP, GdkQuartzKeymapClass))
 
-#ifdef GDK_COMPILATION
+#ifdef GTK_COMPILATION
 typedef struct _GdkQuartzKeymap GdkQuartzKeymap;
 #else
 typedef GdkKeymap GdkQuartzKeymap;
diff --git a/gdk/quartz/gdkquartzmonitor.h b/gdk/quartz/gdkquartzmonitor.h
index 92a619e935..a1ccda70d2 100644
--- a/gdk/quartz/gdkquartzmonitor.h
+++ b/gdk/quartz/gdkquartzmonitor.h
@@ -20,7 +20,7 @@
 #ifndef __GDK_QUARTZ_MONITOR_H__
 #define __GDK_QUARTZ_MONITOR_H__
 
-#if !defined (__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDKQUARTZ_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/quartz/gdkquartz.h> can be included directly."
 #endif
 
diff --git a/gdk/quartz/gdkquartzscreen.h b/gdk/quartz/gdkquartzscreen.h
index 245068df25..3281ebc0ab 100644
--- a/gdk/quartz/gdkquartzscreen.h
+++ b/gdk/quartz/gdkquartzscreen.h
@@ -19,7 +19,7 @@
 #ifndef __GDK_QUARTZ_SCREEN_H__
 #define __GDK_QUARTZ_SCREEN_H__
 
-#if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/quartz/gdkquartz.h> can be included directly."
 #endif
 
diff --git a/gdk/quartz/gdkquartzsurface.h b/gdk/quartz/gdkquartzsurface.h
index 5bfd8d5062..6faa326b1c 100644
--- a/gdk/quartz/gdkquartzsurface.h
+++ b/gdk/quartz/gdkquartzsurface.h
@@ -20,7 +20,7 @@
 #ifndef __GDK_QUARTZ_SURFACE_H__
 #define __GDK_QUARTZ_SURFACE_H__
 
-#if !defined (__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDKQUARTZ_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/quartz/gdkquartz.h> can be included directly."
 #endif
 
@@ -35,7 +35,7 @@ G_BEGIN_DECLS
 #define GDK_IS_QUARTZ_SURFACE_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_QUARTZ_SURFACE))
 #define GDK_QUARTZ_SURFACE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_QUARTZ_SURFACE, GdkQuartzSurfaceClass))
 
-#ifdef GDK_COMPILATION
+#ifdef GTK_COMPILATION
 typedef struct _GdkQuartzSurface GdkQuartzSurface;
 #else
 typedef GdkSurface GdkQuartzSurface;
diff --git a/gdk/quartz/gdkquartzutils.h b/gdk/quartz/gdkquartzutils.h
index 12feec3b86..9909aa18b5 100644
--- a/gdk/quartz/gdkquartzutils.h
+++ b/gdk/quartz/gdkquartzutils.h
@@ -20,7 +20,7 @@
 #ifndef __GDK_QUARTZ_UTILS_H__
 #define __GDK_QUARTZ_UTILS_H__
 
-#if !defined (__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDKQUARTZ_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/quartz/gdkquartz.h> can be included directly."
 #endif
 
diff --git a/gdk/quartz/meson.build b/gdk/quartz/meson.build
index 0575bb99a6..37c3ef2cf6 100644
--- a/gdk/quartz/meson.build
+++ b/gdk/quartz/meson.build
@@ -41,5 +41,5 @@ gdk_quartz_deps = [ # FIXME
 libgdk_quartz = static_library('gdk-quartz',
   gdk_quartz_sources, gdkconfig, gdkenum_h,
   include_directories: [confinc, gdkinc],
-  c_args: ['-DGDK_COMPILATION', '-DG_LOG_DOMAIN="Gdk"', '-xobjective-c'],
+  c_args: ['-DGTK_COMPILATION', '-DG_LOG_DOMAIN="Gdk"', '-xobjective-c'],
   dependencies: [gdk_deps, gdk_quartz_deps])