diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2019-11-27 13:33:43 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2019-11-27 13:33:43 +0000 |
| commit | def700739d4f1884be25c63f9df32c583fe4418a (patch) | |
| tree | b153cea8052a45d1985e5d9105107dea56d37844 /gdk | |
| parent | 9f69c7f3e8809af6e97825ae5dd2191c6d4008fc (diff) | |
| download | gtk+-def700739d4f1884be25c63f9df32c583fe4418a.tar.gz | |
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.
Diffstat (limited to 'gdk')
97 files changed, 123 insertions, 123 deletions
diff --git a/gdk/broadway/gdkbroadwaycursor.h b/gdk/broadway/gdkbroadwaycursor.h index 6b5fcc8626..2ca1a76134 100644 --- a/gdk/broadway/gdkbroadwaycursor.h +++ b/gdk/broadway/gdkbroadwaycursor.h @@ -25,7 +25,7 @@ #ifndef __GDK_BROADWAY_CURSOR_H__ #define __GDK_BROADWAY_CURSOR_H__ -#if !defined (__GDKBROADWAY_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDKBROADWAY_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/broadway/gdkbroadway.h> can be included directly." #endif @@ -40,7 +40,7 @@ G_BEGIN_DECLS #define GDK_IS_BROADWAY_CURSOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_BROADWAY_CURSOR)) #define GDK_BROADWAY_CURSOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_BROADWAY_CURSOR, GdkBroadwayCursorClass)) -#ifdef GDK_COMPILATION +#ifdef GTK_COMPILATION typedef struct _GdkBroadwayCursor GdkBroadwayCursor; #else typedef GdkCursor GdkBroadwayCursor; diff --git a/gdk/broadway/gdkbroadwaydisplay.h b/gdk/broadway/gdkbroadwaydisplay.h index e1e0ffb10d..b7293dc932 100644 --- a/gdk/broadway/gdkbroadwaydisplay.h +++ b/gdk/broadway/gdkbroadwaydisplay.h @@ -18,7 +18,7 @@ #ifndef __GDK_BROADWAY_DISPLAY_H__ #define __GDK_BROADWAY_DISPLAY_H__ -#if !defined (__GDKBROADWAY_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDKBROADWAY_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/broadway/gdkbroadway.h> can be included directly." #endif @@ -26,7 +26,7 @@ G_BEGIN_DECLS -#ifdef GDK_COMPILATION +#ifdef GTK_COMPILATION typedef struct _GdkBroadwayDisplay GdkBroadwayDisplay; #else typedef GdkDisplay GdkBroadwayDisplay; diff --git a/gdk/broadway/gdkbroadwaydisplaymanager.h b/gdk/broadway/gdkbroadwaydisplaymanager.h index 355869d9df..ac453291df 100644 --- a/gdk/broadway/gdkbroadwaydisplaymanager.h +++ b/gdk/broadway/gdkbroadwaydisplaymanager.h @@ -20,7 +20,7 @@ #ifndef __GDK_BROADWAY_DISPLAY_MANAGER_H__ #define __GDK_BROADWAY_DISPLAY_MANAGER_H__ -#if !defined(__GDKBROADWAY_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined(__GDKBROADWAY_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/broadway/gdkbroadway.h> can be included directly." #endif @@ -31,7 +31,7 @@ G_BEGIN_DECLS #define GDK_TYPE_BROADWAY_DISPLAY_MANAGER (gdk_broadway_display_manager_get_type ()) #define GDK_BROADWAY_DISPLAY_MANAGER(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_BROADWAY_DISPLAY_MANAGER, GdkBroadwayDisplayManager)) -#ifdef GDK_COMPILATION +#ifdef GTK_COMPILATION typedef struct _GdkBroadwayDisplayManager GdkBroadwayDisplayManager; #else typedef GdkDisplayManager _GdkBroadwayDisplayManager; diff --git a/gdk/broadway/gdkbroadwaymonitor.h b/gdk/broadway/gdkbroadwaymonitor.h index 36714ff55a..30bc96844b 100644 --- a/gdk/broadway/gdkbroadwaymonitor.h +++ b/gdk/broadway/gdkbroadwaymonitor.h @@ -22,7 +22,7 @@ #ifndef __GDK_BROADWAY_MONITOR_H__ #define __GDK_BROADWAY_MONITOR_H__ -#if !defined (__GDKBROADWAY_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDKBROADWAY_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/broadway/gdkbroadway.h> can be included directly." #endif diff --git a/gdk/broadway/gdkbroadwaysurface.h b/gdk/broadway/gdkbroadwaysurface.h index f9e137b181..d05bf2627f 100644 --- a/gdk/broadway/gdkbroadwaysurface.h +++ b/gdk/broadway/gdkbroadwaysurface.h @@ -36,7 +36,7 @@ G_BEGIN_DECLS #define GDK_IS_BROADWAY_SURFACE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_BROADWAY_SURFACE)) #define GDK_BROADWAY_SURFACE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_BROADWAY_SURFACE, GdkBroadwaySurfaceClass)) -#ifdef GDK_COMPILATION +#ifdef GTK_COMPILATION typedef struct _GdkBroadwaySurface GdkBroadwaySurface; #else typedef GdkSurface GdkBroadwaySurface; diff --git a/gdk/broadway/gdkdnd-broadway.c b/gdk/broadway/gdkdnd-broadway.c index 67438adcfc..a001cc31ae 100644 --- a/gdk/broadway/gdkdnd-broadway.c +++ b/gdk/broadway/gdkdnd-broadway.c @@ -41,7 +41,7 @@ #define GDK_IS_BROADWAY_DRAG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_BROADWAY_DRAG)) #define GDK_BROADWAY_DRAG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_BROADWAY_DRAG, GdkBroadwayDragClass)) -#ifdef GDK_COMPILATION +#ifdef GTK_COMPILATION typedef struct _GdkBroadwayDrag GdkBroadwayDrag; #else typedef GdkDrag GdkBroadwayDrag; diff --git a/gdk/broadway/meson.build b/gdk/broadway/meson.build index bbb8d12c88..c9aa9314f0 100644 --- a/gdk/broadway/meson.build +++ b/gdk/broadway/meson.build @@ -57,7 +57,7 @@ libgdk_broadway = static_library('gdk-broadway', gdk_broadway_sources, gdkconfig, gdkenum_h, include_directories: [confinc, gdkinc], c_args: [ - '-DGDK_COMPILATION', + '-DGTK_COMPILATION', '-DG_LOG_DOMAIN="Gdk"', ] + common_cflags, link_args: common_ldflags, @@ -71,6 +71,6 @@ executable('gtk4-broadwayd', clienthtml_h, broadwayjs_h, 'broadwayd.c', 'broadway-server.c', 'broadway-output.c', include_directories: [confinc, gdkinc, include_directories('.')], - c_args: ['-DGDK_COMPILATION', '-DG_LOG_DOMAIN="Gdk"', ], + c_args: ['-DGTK_COMPILATION', '-DG_LOG_DOMAIN="Gdk"', ], dependencies : [broadwayd_syslib, gdk_deps], install : true) diff --git a/gdk/gdk-autocleanup.h b/gdk/gdk-autocleanup.h index dd299ddb4d..513725620a 100644 --- a/gdk/gdk-autocleanup.h +++ b/gdk/gdk-autocleanup.h @@ -15,7 +15,7 @@ * License along with this library. If not, see <http://www.gnu.org/licenses/>. */ -#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/gdk.h> can be included directly." #endif diff --git a/gdk/gdkapplaunchcontext.h b/gdk/gdkapplaunchcontext.h index a99ebefbb6..6109480ed0 100644 --- a/gdk/gdkapplaunchcontext.h +++ b/gdk/gdkapplaunchcontext.h @@ -21,7 +21,7 @@ #ifndef __GDK_APP_LAUNCH_CONTEXT_H__ #define __GDK_APP_LAUNCH_CONTEXT_H__ -#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/gdk.h> can be included directly." #endif diff --git a/gdk/gdkcairo.h b/gdk/gdkcairo.h index 4cc7bf0ca7..c4e2d3836c 100644 --- a/gdk/gdkcairo.h +++ b/gdk/gdkcairo.h @@ -18,7 +18,7 @@ #ifndef __GDK_CAIRO_H__ #define __GDK_CAIRO_H__ -#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/gdk.h> can be included directly." #endif diff --git a/gdk/gdkcairocontext.h b/gdk/gdkcairocontext.h index 8d83da7594..d5e3967cfc 100644 --- a/gdk/gdkcairocontext.h +++ b/gdk/gdkcairocontext.h @@ -21,7 +21,7 @@ #ifndef __GDK_CAIRO_CONTEXT__ #define __GDK_CAIRO_CONTEXT__ -#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/gdk.h> can be included directly." #endif diff --git a/gdk/gdkclipboard.h b/gdk/gdkclipboard.h index 5961378d8d..f3b6bba1cc 100644 --- a/gdk/gdkclipboard.h +++ b/gdk/gdkclipboard.h @@ -19,7 +19,7 @@ #ifndef __GDK_CLIPBOARD_H__ #define __GDK_CLIPBOARD_H__ -#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/gdk.h> can be included directly." #endif diff --git a/gdk/gdkconfig.h.meson b/gdk/gdkconfig.h.meson index 115c612d82..e65e3c9408 100644 --- a/gdk/gdkconfig.h.meson +++ b/gdk/gdkconfig.h.meson @@ -1,7 +1,7 @@ #ifndef __GDKCONFIG_H__ #define __GDKCONFIG_H__ -#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/gdk.h> can be included directly." #endif diff --git a/gdk/gdkconfig.h.win32 b/gdk/gdkconfig.h.win32 index c941eb86a0..fb141ad3ba 100644 --- a/gdk/gdkconfig.h.win32 +++ b/gdk/gdkconfig.h.win32 @@ -6,7 +6,7 @@ #ifndef __GDKCONFIG_H__ #define __GDKCONFIG_H__ -#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/gdk.h> can be included directly." #endif diff --git a/gdk/gdkconfig.h.win32_vulkan b/gdk/gdkconfig.h.win32_vulkan index 63f83a9946..1205ceea94 100644 --- a/gdk/gdkconfig.h.win32_vulkan +++ b/gdk/gdkconfig.h.win32_vulkan @@ -6,7 +6,7 @@ #ifndef __GDKCONFIG_H__ #define __GDKCONFIG_H__ -#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/gdk.h> can be included directly." #endif diff --git a/gdk/gdkcontentdeserializer.h b/gdk/gdkcontentdeserializer.h index f98ec61cd0..2b3fda4d81 100644 --- a/gdk/gdkcontentdeserializer.h +++ b/gdk/gdkcontentdeserializer.h @@ -18,7 +18,7 @@ #ifndef __GTK_CONTENT_DESERIALIZER_H__ #define __GTK_CONTENT_DESERIALIZER_H__ -#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/gdk.h> can be included directly." #endif diff --git a/gdk/gdkcontentformats.h b/gdk/gdkcontentformats.h index a530325f02..2fe983ea19 100644 --- a/gdk/gdkcontentformats.h +++ b/gdk/gdkcontentformats.h @@ -18,7 +18,7 @@ #ifndef __GTK_CONTENT_FORMATS_H__ #define __GTK_CONTENT_FORMATS_H__ -#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/gdk.h> can be included directly." #endif diff --git a/gdk/gdkcontentprovider.h b/gdk/gdkcontentprovider.h index 1bdd6fe428..f63be7676c 100644 --- a/gdk/gdkcontentprovider.h +++ b/gdk/gdkcontentprovider.h @@ -19,7 +19,7 @@ #ifndef __GDK_CONTENT_PROVIDER_H__ #define __GDK_CONTENT_PROVIDER_H__ -#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/gdk.h> can be included directly." #endif diff --git a/gdk/gdkcontentproviderimpl.h b/gdk/gdkcontentproviderimpl.h index 8bf05874d1..1c41360243 100644 --- a/gdk/gdkcontentproviderimpl.h +++ b/gdk/gdkcontentproviderimpl.h @@ -19,7 +19,7 @@ #ifndef __GDK_CONTENT_PROVIDER_IMPL_H__ #define __GDK_CONTENT_PROVIDER_IMPL_H__ -#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/gdk.h> can be included directly." #endif diff --git a/gdk/gdkcontentserializer.h b/gdk/gdkcontentserializer.h index 15cb467363..82b4f909a7 100644 --- a/gdk/gdkcontentserializer.h +++ b/gdk/gdkcontentserializer.h @@ -18,7 +18,7 @@ #ifndef __GTK_CONTENT_SERIALIZER_H__ #define __GTK_CONTENT_SERIALIZER_H__ -#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/gdk.h> can be included directly." #endif diff --git a/gdk/gdkcursor.h b/gdk/gdkcursor.h index c1ef58437b..d08baa511a 100644 --- a/gdk/gdkcursor.h +++ b/gdk/gdkcursor.h @@ -25,7 +25,7 @@ #ifndef __GDK_CURSOR_H__ #define __GDK_CURSOR_H__ -#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/gdk.h> can be included directly." #endif diff --git a/gdk/gdkdevice.h b/gdk/gdkdevice.h index 27242a8c29..0179ee04dc 100644 --- a/gdk/gdkdevice.h +++ b/gdk/gdkdevice.h @@ -18,7 +18,7 @@ #ifndef __GDK_DEVICE_H__ #define __GDK_DEVICE_H__ -#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/gdk.h> can be included directly." #endif diff --git a/gdk/gdkdevicepad.h b/gdk/gdkdevicepad.h index 9d00bc7699..475e51a45a 100644 --- a/gdk/gdkdevicepad.h +++ b/gdk/gdkdevicepad.h @@ -20,7 +20,7 @@ #ifndef __GDK_DEVICE_PAD_H__ #define __GDK_DEVICE_PAD_H__ -#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/gdk.h> can be included directly." #endif diff --git a/gdk/gdkdevicetool.h b/gdk/gdkdevicetool.h index 66bab7e699..c48ff628e4 100644 --- a/gdk/gdkdevicetool.h +++ b/gdk/gdkdevicetool.h @@ -18,7 +18,7 @@ #ifndef __GDK_DEVICE_TOOL_H__ #define __GDK_DEVICE_TOOL_H__ -#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/gdk.h> can be included directly." #endif diff --git a/gdk/gdkdisplay.h b/gdk/gdkdisplay.h index aa17eab9bb..fed7d86da2 100644 --- a/gdk/gdkdisplay.h +++ b/gdk/gdkdisplay.h @@ -22,7 +22,7 @@ #ifndef __GDK_DISPLAY_H__ #define __GDK_DISPLAY_H__ -#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/gdk.h> can be included directly." #endif diff --git a/gdk/gdkdisplaymanager.h b/gdk/gdkdisplaymanager.h index 39514260fd..5e66d4145d 100644 --- a/gdk/gdkdisplaymanager.h +++ b/gdk/gdkdisplaymanager.h @@ -25,7 +25,7 @@ #ifndef __GDK_DISPLAY_MANAGER_H__ #define __GDK_DISPLAY_MANAGER_H__ -#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/gdk.h> can be included directly." #endif diff --git a/gdk/gdkdrag.h b/gdk/gdkdrag.h index 984fc80995..80301eb293 100644 --- a/gdk/gdkdrag.h +++ b/gdk/gdkdrag.h @@ -25,7 +25,7 @@ #ifndef __GDK_DND_H__ #define __GDK_DND_H__ -#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/gdk.h> can be included directly." #endif diff --git a/gdk/gdkdrawcontext.h b/gdk/gdkdrawcontext.h index 6a851d1951..e818ddd62d 100644 --- a/gdk/gdkdrawcontext.h +++ b/gdk/gdkdrawcontext.h @@ -21,7 +21,7 @@ #ifndef __GDK_DRAW_CONTEXT__ #define __GDK_DRAW_CONTEXT__ -#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/gdk.h> can be included directly." #endif diff --git a/gdk/gdkdrop.h b/gdk/gdkdrop.h index 857d44082f..db5acd13e9 100644 --- a/gdk/gdkdrop.h +++ b/gdk/gdkdrop.h @@ -21,7 +21,7 @@ #ifndef __GDK_DROP_H__ #define __GDK_DROP_H__ -#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/gdk.h> can be included directly." #endif diff --git a/gdk/gdkenumtypes.h.template b/gdk/gdkenumtypes.h.template index d6f62480bc..e200000cdb 100644 --- a/gdk/gdkenumtypes.h.template +++ b/gdk/gdkenumtypes.h.template @@ -2,7 +2,7 @@ #ifndef __GDK_ENUM_TYPES_H__ #define __GDK_ENUM_TYPES_H__ -#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/gdk.h> can be included directly." #endif diff --git a/gdk/gdkevents.h b/gdk/gdkevents.h index 2ddacb0ede..4f90cd8d07 100644 --- a/gdk/gdkevents.h +++ b/gdk/gdkevents.h @@ -25,7 +25,7 @@ #ifndef __GDK_EVENTS_H__ #define __GDK_EVENTS_H__ -#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/gdk.h> can be included directly." #endif diff --git a/gdk/gdkframeclock.h b/gdk/gdkframeclock.h index d1a91f9c25..962bf0c189 100644 --- a/gdk/gdkframeclock.h +++ b/gdk/gdkframeclock.h @@ -25,7 +25,7 @@ #ifndef __GDK_FRAME_CLOCK_H__ #define __GDK_FRAME_CLOCK_H__ -#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/gdk.h> can be included directly." #endif diff --git a/gdk/gdkframetimings.h b/gdk/gdkframetimings.h index cfe6435787..7ed36301b5 100644 --- a/gdk/gdkframetimings.h +++ b/gdk/gdkframetimings.h @@ -18,7 +18,7 @@ #ifndef __GDK_FRAME_TIMINGS_H__ #define __GDK_FRAME_TIMINGS_H__ -#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/gdk.h> can be included directly." #endif diff --git a/gdk/gdkglcontext.h b/gdk/gdkglcontext.h index 83585fbe25..10bac82e9b 100644 --- a/gdk/gdkglcontext.h +++ b/gdk/gdkglcontext.h @@ -21,7 +21,7 @@ #ifndef __GDK_GL_CONTEXT_H__ #define __GDK_GL_CONTEXT_H__ -#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/gdk.h> can be included directly." #endif diff --git a/gdk/gdkgltexture.h b/gdk/gdkgltexture.h index 342f21a10b..54e4fee7e7 100644 --- a/gdk/gdkgltexture.h +++ b/gdk/gdkgltexture.h @@ -19,7 +19,7 @@ #ifndef __GDK_GL_TEXTURE_H__ #define __GDK_GL_TEXTURE_H__ -#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/gdk.h> can be included directly." #endif diff --git a/gdk/gdkkeys.h b/gdk/gdkkeys.h index d6a0f0cb19..1c9093e807 100644 --- a/gdk/gdkkeys.h +++ b/gdk/gdkkeys.h @@ -25,7 +25,7 @@ #ifndef __GDK_KEYS_H__ #define __GDK_KEYS_H__ -#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/gdk.h> can be included directly." #endif diff --git a/gdk/gdkmemorytexture.h b/gdk/gdkmemorytexture.h index 7064455378..eea2fda324 100644 --- a/gdk/gdkmemorytexture.h +++ b/gdk/gdkmemorytexture.h @@ -20,7 +20,7 @@ #ifndef __GDK_MEMORY_TEXTURE__H__ #define __GDK_MEMORY_TEXTURE__H__ -#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/gdk.h> can be included directly." #endif diff --git a/gdk/gdkmonitor.h b/gdk/gdkmonitor.h index b711195e31..832f7010e9 100644 --- a/gdk/gdkmonitor.h +++ b/gdk/gdkmonitor.h @@ -22,7 +22,7 @@ #ifndef __GDK_MONITOR_H__ #define __GDK_MONITOR_H__ -#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/gdk.h> can be included directly." #endif diff --git a/gdk/gdkpaintable.h b/gdk/gdkpaintable.h index 7686286c87..b32918c633 100644 --- a/gdk/gdkpaintable.h +++ b/gdk/gdkpaintable.h @@ -20,7 +20,7 @@ #ifndef __GDK_PAINTABLE_H__ #define __GDK_PAINTABLE_H__ -#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/gdk.h> can be included directly." #endif diff --git a/gdk/gdkpango.h b/gdk/gdkpango.h index 2f2d0d2a2e..1378e7892a 100644 --- a/gdk/gdkpango.h +++ b/gdk/gdkpango.h @@ -18,7 +18,7 @@ #ifndef __GDK_PANGO_H__ #define __GDK_PANGO_H__ -#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/gdk.h> can be included directly." #endif diff --git a/gdk/gdkpixbuf.h b/gdk/gdkpixbuf.h index 65e49348c2..c2538c9633 100644 --- a/gdk/gdkpixbuf.h +++ b/gdk/gdkpixbuf.h @@ -25,7 +25,7 @@ #ifndef __GDK_PIXBUF_H__ #define __GDK_PIXBUF_H__ -#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/gdk.h> can be included directly." #endif diff --git a/gdk/gdkproperty.h b/gdk/gdkproperty.h index c04c7e2e89..a54adc2775 100644 --- a/gdk/gdkproperty.h +++ b/gdk/gdkproperty.h @@ -25,7 +25,7 @@ #ifndef __GDK_PROPERTY_H__ #define __GDK_PROPERTY_H__ -#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/gdk.h> can be included directly." #endif diff --git a/gdk/gdkrectangle.h b/gdk/gdkrectangle.h index 3b6349c28e..0f28fa6f4b 100644 --- a/gdk/gdkrectangle.h +++ b/gdk/gdkrectangle.h @@ -25,7 +25,7 @@ #ifndef __GDK_RECTANGLE_H__ #define __GDK_RECTANGLE_H__ -#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/gdk.h> can be included directly." #endif diff --git a/gdk/gdkrgba.h b/gdk/gdkrgba.h index 7a4e4581f1..d5f8d80cae 100644 --- a/gdk/gdkrgba.h +++ b/gdk/gdkrgba.h @@ -25,7 +25,7 @@ #ifndef __GDK_RGBA_H__ #define __GDK_RGBA_H__ -#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/gdk.h> can be included directly." #endif diff --git a/gdk/gdkseat.h b/gdk/gdkseat.h index 14d7f83a63..e26676e459 100644 --- a/gdk/gdkseat.h +++ b/gdk/gdkseat.h @@ -20,7 +20,7 @@ #ifndef __GDK_SEAT_H__ #define __GDK_SEAT_H__ -#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/gdk.h> can be included directly." #endif diff --git a/gdk/gdksnapshot.h b/gdk/gdksnapshot.h index 5f282f69fa..ccee850e98 100644 --- a/gdk/gdksnapshot.h +++ b/gdk/gdksnapshot.h @@ -20,7 +20,7 @@ #ifndef __GDK_SNAPSHOT_H__ #define __GDK_SNAPSHOT_H__ -#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/gdk.h> can be included directly." #endif diff --git a/gdk/gdksurface.h b/gdk/gdksurface.h index 6b525e89dc..c968cae369 100644 --- a/gdk/gdksurface.h +++ b/gdk/gdksurface.h @@ -25,7 +25,7 @@ #ifndef __GDK_SURFACE_H__ #define __GDK_SURFACE_H__ -#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/gdk.h> can be included directly." #endif diff --git a/gdk/gdktexture.h b/gdk/gdktexture.h index be43990a9f..f7d4fbf567 100644 --- a/gdk/gdktexture.h +++ b/gdk/gdktexture.h @@ -19,7 +19,7 @@ #ifndef __GDK_TEXTURE_H__ #define __GDK_TEXTURE_H__ -#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/gdk.h> can be included directly." #endif diff --git a/gdk/gdktypes.h b/gdk/gdktypes.h index 3cd6472d82..faa842ae85 100644 --- a/gdk/gdktypes.h +++ b/gdk/gdktypes.h @@ -25,7 +25,7 @@ #ifndef __GDK_TYPES_H__ #define __GDK_TYPES_H__ -#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/gdk.h> can be included directly." #endif diff --git a/gdk/gdkversionmacros.h.in b/gdk/gdkversionmacros.h.in index 75c725ce91..981001ae95 100644 --- a/gdk/gdkversionmacros.h.in +++ b/gdk/gdkversionmacros.h.in @@ -15,7 +15,7 @@ * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ -#if !defined (__GDK_H_INSIDE__) && !defined (__GTK_CSS_H_INSIDE__) && !defined (GDK_COMPILATION) && !defined (GTK_CSS_COMPILATION) +#if !defined (__GDK_H_INSIDE__) && !defined (__GTK_CSS_H_INSIDE__) && !defined (GTK_COMPILATION) && !defined (GTK_CSS_COMPILATION) #error "Only <gdk/gdk.h> can be included directly." #endif diff --git a/gdk/gdkvulkancontext.h b/gdk/gdkvulkancontext.h index 089a32b260..7b184b81e9 100644 --- a/gdk/gdkvulkancontext.h +++ b/gdk/gdkvulkancontext.h @@ -21,7 +21,7 @@ #ifndef __GDK_VULKAN_CONTEXT__ #define __GDK_VULKAN_CONTEXT__ -#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/gdk.h> can be included directly." #endif diff --git a/gdk/meson.build b/gdk/meson.build index 21c38df33e..6089e50ea5 100644 --- a/gdk/meson.build +++ b/gdk/meson.build @@ -234,7 +234,7 @@ libgdk = static_library('gdk', link_with: [libgtk_css, ], include_directories: [confinc, gdkx11_inc, wlinc], c_args: [ - '-DGDK_COMPILATION', + '-DGTK_COMPILATION', '-DG_LOG_DOMAIN="Gdk"', ] + common_cflags, link_whole: gdk_backends, 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]) diff --git a/gdk/wayland/gdkwaylanddevice.h b/gdk/wayland/gdkwaylanddevice.h index 7bb843e1db..d0daaeae8c 100644 --- a/gdk/wayland/gdkwaylanddevice.h +++ b/gdk/wayland/gdkwaylanddevice.h @@ -18,7 +18,7 @@ #ifndef __GDK_WAYLAND_DEVICE_H__ #define __GDK_WAYLAND_DEVICE_H__ -#if !defined (__GDKWAYLAND_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDKWAYLAND_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/wayland/gdkwayland.h> can be included directly." #endif @@ -28,7 +28,7 @@ G_BEGIN_DECLS -#ifdef GDK_COMPILATION +#ifdef GTK_COMPILATION typedef struct _GdkWaylandDevice GdkWaylandDevice; #else typedef GdkDevice GdkWaylandDevice; diff --git a/gdk/wayland/gdkwaylanddisplay.h b/gdk/wayland/gdkwaylanddisplay.h index 99dfe47775..e07fe84915 100644 --- a/gdk/wayland/gdkwaylanddisplay.h +++ b/gdk/wayland/gdkwaylanddisplay.h @@ -18,7 +18,7 @@ #ifndef __GDK_WAYLAND_DISPLAY_H__ #define __GDK_WAYLAND_DISPLAY_H__ -#if !defined (__GDKWAYLAND_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDKWAYLAND_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/wayland/gdkwayland.h> can be included directly." #endif @@ -28,7 +28,7 @@ G_BEGIN_DECLS -#ifdef GDK_COMPILATION +#ifdef GTK_COMPILATION typedef struct _GdkWaylandDisplay GdkWaylandDisplay; #else typedef GdkDisplay GdkWaylandDisplay; diff --git a/gdk/wayland/gdkwaylandglcontext.h b/gdk/wayland/gdkwaylandglcontext.h index 1e99d01b30..34a1e4c2a4 100644 --- a/gdk/wayland/gdkwaylandglcontext.h +++ b/gdk/wayland/gdkwaylandglcontext.h @@ -22,7 +22,7 @@ #ifndef __GDK_WAYLAND_GL_CONTEXT_H__ #define __GDK_WAYLAND_GL_CONTEXT_H__ -#if !defined (__GDKWAYLAND_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDKWAYLAND_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/wayland/gdkwayland.h> can be included directly." #endif diff --git a/gdk/wayland/gdkwaylandmonitor.h b/gdk/wayland/gdkwaylandmonitor.h index 8ad95128b5..f856a1108d 100644 --- a/gdk/wayland/gdkwaylandmonitor.h +++ b/gdk/wayland/gdkwaylandmonitor.h @@ -22,7 +22,7 @@ #ifndef __GDK_WAYLAND_MONITOR_H__ #define __GDK_WAYLAND_MONITOR_H__ -#if !defined (__GDKWAYLAND_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDKWAYLAND_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/wayland/gdkwayland.h> can be included directly." #endif diff --git a/gdk/wayland/gdkwaylandsurface.h b/gdk/wayland/gdkwaylandsurface.h index 1c4f057a74..b7b73ba8ef 100644 --- a/gdk/wayland/gdkwaylandsurface.h +++ b/gdk/wayland/gdkwaylandsurface.h @@ -18,7 +18,7 @@ #ifndef __GDK_WAYLAND_SURFACE_H__ #define __GDK_WAYLAND_SURFACE_H__ -#if !defined (__GDKWAYLAND_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDKWAYLAND_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/wayland/gdkwayland.h> can be included directly." #endif @@ -28,7 +28,7 @@ G_BEGIN_DECLS -#ifdef GDK_COMPILATION +#ifdef GTK_COMPILATION typedef struct _GdkWaylandSurface GdkWaylandSurface; #else typedef GdkSurface GdkWaylandSurface; diff --git a/gdk/wayland/meson.build b/gdk/wayland/meson.build index f40fe3b415..fe094bb7e4 100644 --- a/gdk/wayland/meson.build +++ b/gdk/wayland/meson.build @@ -101,7 +101,7 @@ libgdk_wayland = static_library('gdk-wayland', gdk_wayland_sources, gdk_wayland_gen_headers, gdkconfig, gdkenum_h, include_directories: [ confinc, gdkinc, ], c_args: [ - '-DGDK_COMPILATION', + '-DGTK_COMPILATION', '-DG_LOG_DOMAIN="Gdk"', ] + common_cflags, link_args: common_ldflags, diff --git a/gdk/win32/gdkwin32cursor.h b/gdk/win32/gdkwin32cursor.h index 60d8a6ad5d..ec03f77212 100644 --- a/gdk/win32/gdkwin32cursor.h +++ b/gdk/win32/gdkwin32cursor.h @@ -25,7 +25,7 @@ #ifndef __GDK_WIN32_CURSOR_H__ #define __GDK_WIN32_CURSOR_H__ -#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/gdkwin32.h> can be included directly." #endif @@ -56,7 +56,7 @@ struct _GdkWin32HCursorFake #define gdk_win32_hcursor_get_handle_fast(x) (((struct _GdkWin32HCursorFake *) x)->readonly_handle) -#if defined (GDK_COMPILATION) +#if defined (GTK_COMPILATION) #define gdk_win32_hcursor_get_handle gdk_win32_hcursor_get_handle_fast #else GDK_AVAILABLE_IN_ALL diff --git a/gdk/win32/gdkwin32display.h b/gdk/win32/gdkwin32display.h index 75acc4f86b..7671fd88a2 100644 --- a/gdk/win32/gdkwin32display.h +++ b/gdk/win32/gdkwin32display.h @@ -25,7 +25,7 @@ #ifndef __GDK_WIN32_DISPLAY_H__ #define __GDK_WIN32_DISPLAY_H__ -#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/gdkwin32.h> can be included directly." #endif @@ -35,7 +35,7 @@ G_BEGIN_DECLS -#ifdef GDK_COMPILATION +#ifdef GTK_COMPILATION typedef struct _GdkWin32Display GdkWin32Display; #else typedef GdkDisplay GdkWin32Display; diff --git a/gdk/win32/gdkwin32displaymanager.h b/gdk/win32/gdkwin32displaymanager.h index b4d9e71923..ce7e9ffb1c 100644 --- a/gdk/win32/gdkwin32displaymanager.h +++ b/gdk/win32/gdkwin32displaymanager.h @@ -18,7 +18,7 @@ #ifndef __GDK_WIN32_DISPLAY_MANAGER_H__ #define __GDK_WIN32_DISPLAY_MANAGER_H__ -#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/gdkwin32.h> can be included directly." #endif @@ -26,7 +26,7 @@ G_BEGIN_DECLS -#ifdef GDK_COMPILATION +#ifdef GTK_COMPILATION typedef struct _GdkWin32DisplayManager GdkWin32DisplayManager; #else typedef GdkDisplayManager GdkWin32DisplayManager; diff --git a/gdk/win32/gdkwin32dnd-private.h b/gdk/win32/gdkwin32dnd-private.h index efe081f77e..7fe9324466 100644 --- a/gdk/win32/gdkwin32dnd-private.h +++ b/gdk/win32/gdkwin32dnd-private.h @@ -18,7 +18,7 @@ #ifndef __GDK_WIN32_DND_PRIVATE_H__ #define __GDK_WIN32_DND_PRIVATE_H__ -#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/gdkwin32.h> can be included directly." #endif diff --git a/gdk/win32/gdkwin32dnd.h b/gdk/win32/gdkwin32dnd.h index af6cc402dd..a40aea7d96 100644 --- a/gdk/win32/gdkwin32dnd.h +++ b/gdk/win32/gdkwin32dnd.h @@ -18,7 +18,7 @@ #ifndef __GDK_WIN32_DND_H__ #define __GDK_WIN32_DND_H__ -#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/gdkwin32.h> can be included directly." #endif @@ -33,7 +33,7 @@ G_BEGIN_DECLS #define GDK_IS_WIN32_DRAG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_WIN32_DRAG)) #define GDK_WIN32_DRAG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_WIN32_DRAG, GdkWin32DragClass)) -#ifdef GDK_COMPILATION +#ifdef GTK_COMPILATION typedef struct _GdkWin32Drag GdkWin32Drag; #else typedef GdkDrag GdkWin32Drag; diff --git a/gdk/win32/gdkwin32glcontext.h b/gdk/win32/gdkwin32glcontext.h index e87192d700..6b55735a9d 100644 --- a/gdk/win32/gdkwin32glcontext.h +++ b/gdk/win32/gdkwin32glcontext.h @@ -21,7 +21,7 @@ #ifndef __GDK_WIN32_GL_CONTEXT_H__ #define __GDK_WIN32_GL_CONTEXT_H__ -#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/gdkwin32.h> can be included directly." #endif diff --git a/gdk/win32/gdkwin32keys.h b/gdk/win32/gdkwin32keys.h index bc7add5bfc..5dcef11fa1 100644 --- a/gdk/win32/gdkwin32keys.h +++ b/gdk/win32/gdkwin32keys.h @@ -18,7 +18,7 @@ #ifndef __GDK_WIN32_KEYS_H__ #define __GDK_WIN32_KEYS_H__ -#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/gdkwin32.h> can be included directly." #endif @@ -44,7 +44,7 @@ typedef enum GDK_WIN32_KEYMAP_MATCH_EXACT } GdkWin32KeymapMatch; -#ifdef GDK_COMPILATION +#ifdef GTK_COMPILATION typedef struct _GdkWin32Keymap GdkWin32Keymap; #else typedef GdkKeymap GdkWin32Keymap; diff --git a/gdk/win32/gdkwin32misc.h b/gdk/win32/gdkwin32misc.h index 5410c8edda..dcd9471dc9 100644 --- a/gdk/win32/gdkwin32misc.h +++ b/gdk/win32/gdkwin32misc.h @@ -26,7 +26,7 @@ #ifndef __GDK_WIN32_MISC_H__ #define __GDK_WIN32_MISC_H__ -#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/gdkwin32.h> can be included directly." #endif @@ -85,7 +85,7 @@ GDK_AVAILABLE_IN_ALL GdkSurface * gdk_win32_surface_lookup_for_display (GdkDisplay *display, HWND anid); -#if defined (INSIDE_GDK_WIN32) || defined (GDK_COMPILATION) || defined (GTK_COMPILATION) +#if defined (INSIDE_GDK_WIN32) || defined (GTK_COMPILATION) || defined (GTK_COMPILATION) /* For internal GTK use only */ GDK_AVAILABLE_IN_ALL diff --git a/gdk/win32/gdkwin32monitor.h b/gdk/win32/gdkwin32monitor.h index 7814bf31f4..873ab8026e 100644 --- a/gdk/win32/gdkwin32monitor.h +++ b/gdk/win32/gdkwin32monitor.h @@ -23,7 +23,7 @@ #ifndef __GDK_WIN32_MONITOR_H__ #define __GDK_WIN32_MONITOR_H__ -#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/gdkwin32.h> can be included directly." #endif @@ -35,7 +35,7 @@ G_BEGIN_DECLS #define GDK_WIN32_MONITOR(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_WIN32_MONITOR, GdkWin32Monitor)) #define GDK_IS_WIN32_MONITOR(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_WIN32_MONITOR)) -#ifdef GDK_COMPILATION +#ifdef GTK_COMPILATION typedef struct _GdkWin32Monitor GdkWin32Monitor; #else typedef GdkMonitor GdkWin32Monitor; diff --git a/gdk/win32/gdkwin32screen.h b/gdk/win32/gdkwin32screen.h index eb12e2ad9b..fa2b8daff8 100644 --- a/gdk/win32/gdkwin32screen.h +++ b/gdk/win32/gdkwin32screen.h @@ -25,7 +25,7 @@ #ifndef __GDK_WIN32_SCREEN_H__ #define __GDK_WIN32_SCREEN_H__ -#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/gdkwin32.h> can be included directly." #endif diff --git a/gdk/win32/gdkwin32surface.h b/gdk/win32/gdkwin32surface.h index f081a49aad..655abd0113 100644 --- a/gdk/win32/gdkwin32surface.h +++ b/gdk/win32/gdkwin32surface.h @@ -25,7 +25,7 @@ #ifndef __GDK_WIN32_SURFACE_H__ #define __GDK_WIN32_SURFACE_H__ -#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/gdkwin32.h> can be included directly." #endif @@ -40,7 +40,7 @@ G_BEGIN_DECLS #define GDK_IS_WIN32_SURFACE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_WIN32_SURFACE)) #define GDK_WIN32_SURFACE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_WIN32_SURFACE, GdkWin32SurfaceClass)) -#ifdef GDK_COMPILATION +#ifdef GTK_COMPILATION typedef struct _GdkWin32Surface GdkWin32Surface; #else typedef GdkSurface GdkWin32Surface; diff --git a/gdk/win32/meson.build b/gdk/win32/meson.build index 9567c96609..2a1cbe403b 100644 --- a/gdk/win32/meson.build +++ b/gdk/win32/meson.build @@ -50,5 +50,5 @@ gdk_win32_deps = [ # FIXME libgdk_win32 = static_library('gdk-win32', gdk_win32_sources, gdkconfig, gdkenum_h, include_directories: [confinc, gdkinc], - c_args: ['-DGDK_COMPILATION', '-DG_LOG_DOMAIN="Gdk"', '-DINSIDE_GDK_WIN32'], + c_args: ['-DGTK_COMPILATION', '-DG_LOG_DOMAIN="Gdk"', '-DINSIDE_GDK_WIN32'], dependencies: [gdk_deps, gdk_win32_deps]) diff --git a/gdk/x11/gdkx-autocleanups.h b/gdk/x11/gdkx-autocleanups.h index e2353f85ee..123f77e811 100644 --- a/gdk/x11/gdkx-autocleanups.h +++ b/gdk/x11/gdkx-autocleanups.h @@ -15,7 +15,7 @@ * License along with this library. If not, see <http://www.gnu.org/licenses/>. */ -#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDKX_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/x11/gdkx.h> can be included directly." #endif diff --git a/gdk/x11/gdkx11applaunchcontext.h b/gdk/x11/gdkx11applaunchcontext.h index 93a2f8c1da..a1ef85af54 100644 --- a/gdk/x11/gdkx11applaunchcontext.h +++ b/gdk/x11/gdkx11applaunchcontext.h @@ -18,7 +18,7 @@ #ifndef __GDK_X11_APP_LAUNCH_CONTEXT_H__ #define __GDK_X11_APP_LAUNCH_CONTEXT_H__ -#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDKX_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/x11/gdkx.h> can be included directly." #endif @@ -33,7 +33,7 @@ G_BEGIN_DECLS #define GDK_IS_X11_APP_LAUNCH_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_X11_APP_LAUNCH_CONTEXT)) #define GDK_X11_APP_LAUNCH_CONTEXT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_X11_APP_LAUNCH_CONTEXT, GdkX11AppLaunchContextClass)) -#ifdef GDK_COMPILATION +#ifdef GTK_COMPILATION typedef struct _GdkX11AppLaunchContext GdkX11AppLaunchContext; #else typedef GdkAppLaunchContext GdkX11AppLaunchContext; diff --git a/gdk/x11/gdkx11device.h b/gdk/x11/gdkx11device.h index cab49734df..ae9e606303 100644 --- a/gdk/x11/gdkx11device.h +++ b/gdk/x11/gdkx11device.h @@ -18,7 +18,7 @@ #ifndef __GDK_X11_DEVICE_H__ #define __GDK_X11_DEVICE_H__ -#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDKX_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/x11/gdkx.h> can be included directly." #endif diff --git a/gdk/x11/gdkx11devicemanager.h b/gdk/x11/gdkx11devicemanager.h index f3b0815462..f1c9ac62c9 100644 --- a/gdk/x11/gdkx11devicemanager.h +++ b/gdk/x11/gdkx11devicemanager.h @@ -18,7 +18,7 @@ #ifndef __GDK_X11_DEVICE_MANAGER_H__ #define __GDK_X11_DEVICE_MANAGER_H__ -#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDKX_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/x11/gdkx.h> can be included directly." #endif diff --git a/gdk/x11/gdkx11display.h b/gdk/x11/gdkx11display.h index b885357f70..c4801b2e33 100644 --- a/gdk/x11/gdkx11display.h +++ b/gdk/x11/gdkx11display.h @@ -25,7 +25,7 @@ #ifndef __GDK_X11_DISPLAY_H__ #define __GDK_X11_DISPLAY_H__ -#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDKX_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/x11/gdkx.h> can be included directly." #endif @@ -37,7 +37,7 @@ G_BEGIN_DECLS -#ifdef GDK_COMPILATION +#ifdef GTK_COMPILATION typedef struct _GdkX11Display GdkX11Display; #else typedef GdkDisplay GdkX11Display; diff --git a/gdk/x11/gdkx11dnd.h b/gdk/x11/gdkx11dnd.h index 5318983375..4da3d31652 100644 --- a/gdk/x11/gdkx11dnd.h +++ b/gdk/x11/gdkx11dnd.h @@ -18,7 +18,7 @@ #ifndef __GDK_X11_DND_H__ #define __GDK_X11_DND_H__ -#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDKX_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/x11/gdkx.h> can be included directly." #endif @@ -33,7 +33,7 @@ G_BEGIN_DECLS #define GDK_IS_X11_DRAG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_X11_DRAG)) #define GDK_X11_DRAG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_X11_DRAG, GdkX11DragClass)) -#ifdef GDK_COMPILATION +#ifdef GTK_COMPILATION typedef struct _GdkX11Drag GdkX11Drag; #else typedef GdkDrag GdkX11Drag; diff --git a/gdk/x11/gdkx11glcontext.h b/gdk/x11/gdkx11glcontext.h index 29235dcb02..4053ac4b4f 100644 --- a/gdk/x11/gdkx11glcontext.h +++ b/gdk/x11/gdkx11glcontext.h @@ -21,7 +21,7 @@ #ifndef __GDK_X11_GL_CONTEXT_H__ #define __GDK_X11_GL_CONTEXT_H__ -#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDKX_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/x11/gdkx.h> can be included directly." #endif diff --git a/gdk/x11/gdkx11keys.h b/gdk/x11/gdkx11keys.h index e4575d5927..b33d4cddf0 100644 --- a/gdk/x11/gdkx11keys.h +++ b/gdk/x11/gdkx11keys.h @@ -18,7 +18,7 @@ #ifndef __GDK_X11_KEYS_H__ #define __GDK_X11_KEYS_H__ -#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDKX_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/x11/gdkx.h> can be included directly." #endif @@ -26,7 +26,7 @@ G_BEGIN_DECLS -#ifdef GDK_COMPILATION +#ifdef GTK_COMPILATION typedef struct _GdkX11Keymap GdkX11Keymap; #else typedef GdkKeymap GdkX11Keymap; diff --git a/gdk/x11/gdkx11monitor.h b/gdk/x11/gdkx11monitor.h index 8f7dd86177..cd0a8d9565 100644 --- a/gdk/x11/gdkx11monitor.h +++ b/gdk/x11/gdkx11monitor.h @@ -22,7 +22,7 @@ #ifndef __GDK_X11_MONITOR_H__ #define __GDK_X11_MONITOR_H__ -#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDKX_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/x11/gdkx.h> can be included directly." #endif diff --git a/gdk/x11/gdkx11property.h b/gdk/x11/gdkx11property.h index 8fac2b11be..7bdc137216 100644 --- a/gdk/x11/gdkx11property.h +++ b/gdk/x11/gdkx11property.h @@ -25,7 +25,7 @@ #ifndef __GDK_X11_PROPERTY_H__ #define __GDK_X11_PROPERTY_H__ -#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDKX_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/x11/gdkx.h> can be included directly." #endif diff --git a/gdk/x11/gdkx11screen.h b/gdk/x11/gdkx11screen.h index bb82c86979..61b965d992 100644 --- a/gdk/x11/gdkx11screen.h +++ b/gdk/x11/gdkx11screen.h @@ -25,7 +25,7 @@ #ifndef __GDK_X11_SCREEN_H__ #define __GDK_X11_SCREEN_H__ -#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDKX_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/x11/gdkx.h> can be included directly." #endif diff --git a/gdk/x11/gdkx11selection.h b/gdk/x11/gdkx11selection.h index 1a91f11595..2c7d8e2d9b 100644 --- a/gdk/x11/gdkx11selection.h +++ b/gdk/x11/gdkx11selection.h @@ -25,7 +25,7 @@ #ifndef __GDK_X11_SELECTION_H__ #define __GDK_X11_SELECTION_H__ -#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDKX_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/x11/gdkx.h> can be included directly." #endif diff --git a/gdk/x11/gdkx11surface.h b/gdk/x11/gdkx11surface.h index fdd7d8eb95..f2be036d38 100644 --- a/gdk/x11/gdkx11surface.h +++ b/gdk/x11/gdkx11surface.h @@ -25,7 +25,7 @@ #ifndef __GDK_X11_SURFACE_H__ #define __GDK_X11_SURFACE_H__ -#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDKX_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/x11/gdkx.h> can be included directly." #endif @@ -43,7 +43,7 @@ G_BEGIN_DECLS #define GDK_IS_X11_SURFACE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_X11_SURFACE)) #define GDK_X11_SURFACE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_X11_SURFACE, GdkX11SurfaceClass)) -#ifdef GDK_COMPILATION +#ifdef GTK_COMPILATION typedef struct _GdkX11Surface GdkX11Surface; #else typedef GdkSurface GdkX11Surface; diff --git a/gdk/x11/gdkx11utils.h b/gdk/x11/gdkx11utils.h index 7ed8ca833e..c210766ed5 100644 --- a/gdk/x11/gdkx11utils.h +++ b/gdk/x11/gdkx11utils.h @@ -25,7 +25,7 @@ #ifndef __GDK_X11_UTILS_H__ #define __GDK_X11_UTILS_H__ -#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION) +#if !defined (__GDKX_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gdk/x11/gdkx.h> can be included directly." #endif diff --git a/gdk/x11/meson.build b/gdk/x11/meson.build index fce1a92079..bfc6243978 100644 --- a/gdk/x11/meson.build +++ b/gdk/x11/meson.build @@ -69,7 +69,7 @@ libgdk_x11 = static_library('gdk-x11', gdkmarshal_h, gdk_x11_sources, gdkconfig, gdkenum_h, include_directories: [ confinc, gdkinc, ], c_args: [ - '-DGDK_COMPILATION', + '-DGTK_COMPILATION', '-DG_LOG_DOMAIN="Gdk"', ] + common_cflags, link_args: common_ldflags, |