Drop the gdk/gdkversionmacros.h header

It was just added to avoid touching too many files.
Touching them now.

diff --git a/gdk/gdk.c b/gdk/gdk.c
index 1c545455233ebee9e339dcb581e79721d011085c..65c9da23bba35e402f1bbd72c308915a058d9edd 100644 (file)
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -24,7 +24,7 @@
 
 #include "config.h"
 
-#include "gdkversionmacros.h"
+#include "version/gdkversionmacros.h"
 
 #include "gdkresources.h"
 

diff --git a/gdk/gdk.h b/gdk/gdk.h
index 4201b72a86ed216dcf448fc8d33bb26cf200c5e1..64b488267220e156be040d8dd25b6e9f585922bf 100644 (file)
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -75,7 +75,7 @@
 #include <gdk/gdktoplevellayout.h>
 #include <gdk/gdktoplevelsize.h>
 #include <gdk/gdktypes.h>
-#include <gdk/gdkversionmacros.h>
+#include <gdk/version/gdkversionmacros.h>
 #include <gdk/gdkvulkancontext.h>
 
 #undef __GDK_H_INSIDE__

diff --git a/gdk/gdkapplaunchcontext.h b/gdk/gdkapplaunchcontext.h
index 364a2a941ca5a7c23b524c3a05e612545dddf50e..3687402cc67e8428ccf6df35c74221f96c0241df 100644 (file)
--- a/gdk/gdkapplaunchcontext.h
+++ b/gdk/gdkapplaunchcontext.h
@@ -24,7 +24,7 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
-#include <gdk/gdkversionmacros.h>
+#include <gdk/version/gdkversionmacros.h>
 #include <gdk/gdktypes.h>
 
 G_BEGIN_DECLS

diff --git a/gdk/gdkcairo.h b/gdk/gdkcairo.h
index 24af5939d8d7b63560a203e6a000b48149d3de83..37d1d2cb753cc9198a63a14e63c438120a916352 100644 (file)
--- a/gdk/gdkcairo.h
+++ b/gdk/gdkcairo.h
@@ -21,7 +21,7 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
-#include <gdk/gdkversionmacros.h>
+#include <gdk/version/gdkversionmacros.h>
 #include <gdk/gdkrgba.h>
 #include <gdk/gdkpixbuf.h>
 #include <pango/pangocairo.h>

diff --git a/gdk/gdkcairocontext.h b/gdk/gdkcairocontext.h
index a230b2e6630c52fea8ff8248b9856004210da6d8..d696cd56850d2ca068934bdb178c3d4c87faffc7 100644 (file)
--- a/gdk/gdkcairocontext.h
+++ b/gdk/gdkcairocontext.h
@@ -24,7 +24,7 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
-#include <gdk/gdkversionmacros.h>
+#include <gdk/version/gdkversionmacros.h>
 #include <gdk/gdktypes.h>
 
 #include <cairo.h>

diff --git a/gdk/gdkclipboard.h b/gdk/gdkclipboard.h
index f10c95c32b06a090be3b3975087078b68fde94d2..11b638b4e04874f10ddae7f8bca4df76ea3efa5b 100644 (file)
--- a/gdk/gdkclipboard.h
+++ b/gdk/gdkclipboard.h
@@ -22,7 +22,7 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
-#include <gdk/gdkversionmacros.h>
+#include <gdk/version/gdkversionmacros.h>
 #include <gdk/gdktypes.h>
 #include <gio/gio.h>
 

diff --git a/gdk/gdkcontentdeserializer.h b/gdk/gdkcontentdeserializer.h
index be108804343a7637f15354a80fd766aa830bd454..fe756a22259c9a9678b386d88e102f615b2e36e9 100644 (file)
--- a/gdk/gdkcontentdeserializer.h
+++ b/gdk/gdkcontentdeserializer.h
@@ -22,7 +22,7 @@
 #endif
 
 
-#include <gdk/gdkversionmacros.h>
+#include <gdk/version/gdkversionmacros.h>
 #include <gdk/gdktypes.h>
 
 G_BEGIN_DECLS

diff --git a/gdk/gdkcontentformats.h b/gdk/gdkcontentformats.h
index ff9b116db78ac4f63c9984658a9078955cbf9253..e20c900b6da241c39e1c7adc6aaf8562b5699386 100644 (file)
--- a/gdk/gdkcontentformats.h
+++ b/gdk/gdkcontentformats.h
@@ -22,7 +22,7 @@
 #endif
 
 
-#include <gdk/gdkversionmacros.h>
+#include <gdk/version/gdkversionmacros.h>
 #include <gdk/gdktypes.h>
 
 G_BEGIN_DECLS

diff --git a/gdk/gdkcontentprovider.h b/gdk/gdkcontentprovider.h
index 9293a17aea4276833f7b20bdc7063629a38a77c2..c291ca9158562167ad08eb183481fd2e44a354bb 100644 (file)
--- a/gdk/gdkcontentprovider.h
+++ b/gdk/gdkcontentprovider.h
@@ -22,7 +22,7 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
-#include <gdk/gdkversionmacros.h>
+#include <gdk/version/gdkversionmacros.h>
 #include <gdk/gdktypes.h>
 
 

diff --git a/gdk/gdkcontentproviderimpl.h b/gdk/gdkcontentproviderimpl.h
index 94c3ffb6fbc6cea6eec95d7bc05896b5ffc089fd..8e608411c7ae838dbddf6e3bb7290939e2468f3e 100644 (file)
--- a/gdk/gdkcontentproviderimpl.h
+++ b/gdk/gdkcontentproviderimpl.h
@@ -22,7 +22,7 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
-#include <gdk/gdkversionmacros.h>
+#include <gdk/version/gdkversionmacros.h>
 #include <gdk/gdktypes.h>
 
 G_BEGIN_DECLS

diff --git a/gdk/gdkcontentserializer.h b/gdk/gdkcontentserializer.h
index 1322d17a51a3c70dbde402b0563e09ad78348946..137d0993cc1bc1ff9911cc2eb4c5f849c4d4050d 100644 (file)
--- a/gdk/gdkcontentserializer.h
+++ b/gdk/gdkcontentserializer.h
@@ -22,7 +22,7 @@
 #endif
 
 
-#include <gdk/gdkversionmacros.h>
+#include <gdk/version/gdkversionmacros.h>
 #include <gdk/gdktypes.h>
 
 G_BEGIN_DECLS

diff --git a/gdk/gdkcursor.h b/gdk/gdkcursor.h
index f8eb2d7d9ad3e0e98e9bc16b9774f6e91e7a699a..e7277487cf9cbb61a88e215711c00182589fe63e 100644 (file)
--- a/gdk/gdkcursor.h
+++ b/gdk/gdkcursor.h
@@ -28,7 +28,7 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
-#include <gdk/gdkversionmacros.h>
+#include <gdk/version/gdkversionmacros.h>
 #include <gdk/gdktypes.h>
 
 G_BEGIN_DECLS

diff --git a/gdk/gdkdevice.h b/gdk/gdkdevice.h
index 28d0c04c8b8798c489496fd608af871728fbb3e5..5124f49ffbd5a93b459ec25eb279347238dbfb56 100644 (file)
--- a/gdk/gdkdevice.h
+++ b/gdk/gdkdevice.h
@@ -21,7 +21,7 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
-#include <gdk/gdkversionmacros.h>
+#include <gdk/version/gdkversionmacros.h>
 #include <gdk/gdktypes.h>
 #include <gdk/gdkdevicetool.h>
 #include <gdk/gdkenums.h>

diff --git a/gdk/gdkdevicepad.h b/gdk/gdkdevicepad.h
index aa6d56871c8fc0bd3b0c3e8aa725597cf25631f3..050ec1772a193fef4a84401722672fa0c2b64a9b 100644 (file)
--- a/gdk/gdkdevicepad.h
+++ b/gdk/gdkdevicepad.h
@@ -23,7 +23,7 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
-#include <gdk/gdkversionmacros.h>
+#include <gdk/version/gdkversionmacros.h>
 #include <gdk/gdktypes.h>
 
 G_BEGIN_DECLS

diff --git a/gdk/gdkdevicetool.h b/gdk/gdkdevicetool.h
index 0accd67816b42523949bee08b12ebb00d9d98ad1..29718e95d9ef63254e98eb3facfdedd7748dff97 100644 (file)
--- a/gdk/gdkdevicetool.h
+++ b/gdk/gdkdevicetool.h
@@ -23,7 +23,7 @@
 
 #include <gdk/gdkenums.h>
 #include <gdk/gdktypes.h>
-#include <gdk/gdkversionmacros.h>
+#include <gdk/version/gdkversionmacros.h>
 
 
 G_BEGIN_DECLS

diff --git a/gdk/gdkdisplay.h b/gdk/gdkdisplay.h
index 54b514f8cfb501f2bf692e300887038a7ae4965e..a49dc4bba5e0acab0560783b28508eff92ec8b32 100644 (file)
--- a/gdk/gdkdisplay.h
+++ b/gdk/gdkdisplay.h
@@ -25,7 +25,7 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
-#include <gdk/gdkversionmacros.h>
+#include <gdk/version/gdkversionmacros.h>
 #include <gdk/gdktypes.h>
 #include <gdk/gdkevents.h>
 #include <gdk/gdkseat.h>

diff --git a/gdk/gdkdragsurfacesize.h b/gdk/gdkdragsurfacesize.h
index 28d23128be35624a08e59d20e35c97eae249c3f5..95a343dddc186c85ff25477f3abd82709ed5d0f9 100644 (file)
--- a/gdk/gdkdragsurfacesize.h
+++ b/gdk/gdkdragsurfacesize.h
@@ -23,7 +23,7 @@
 #endif
 
 #include <gdk/gdktypes.h>
-#include <gdk/gdkversionmacros.h>
+#include <gdk/version/gdkversionmacros.h>
 
 G_BEGIN_DECLS
 

diff --git a/gdk/gdkdrawcontext.h b/gdk/gdkdrawcontext.h
index e414ede92c2ec9a9fb99e8a72349ff2b0ea1a617..be3ec256e1203318dba0bc9da37e8e65550c9b09 100644 (file)
--- a/gdk/gdkdrawcontext.h
+++ b/gdk/gdkdrawcontext.h
@@ -24,7 +24,7 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
-#include <gdk/gdkversionmacros.h>
+#include <gdk/version/gdkversionmacros.h>
 #include <gdk/gdktypes.h>
 
 G_BEGIN_DECLS

diff --git a/gdk/gdkdrop.h b/gdk/gdkdrop.h
index 8f4236007c8c1ee2818fbc77b0a189ddefd763bb..edd97badad0848e33d0d35014f6f8f9d8420df73 100644 (file)
--- a/gdk/gdkdrop.h
+++ b/gdk/gdkdrop.h
@@ -26,7 +26,7 @@
 
 #include <gdk/gdkenums.h>
 #include <gdk/gdktypes.h>
-#include <gdk/gdkversionmacros.h>
+#include <gdk/version/gdkversionmacros.h>
 
 G_BEGIN_DECLS
 

diff --git a/gdk/gdkevents.h b/gdk/gdkevents.h
index 7b75a3f3d61cc7eec564c213b69ed12fa00899c0..ba0a86499f1f5f82be66d92e9c9f2b74b0f13768 100644 (file)
--- a/gdk/gdkevents.h
+++ b/gdk/gdkevents.h
@@ -33,7 +33,7 @@
 #include <gdk/gdkdrag.h>
 #include <gdk/gdkenums.h>
 #include <gdk/gdktypes.h>
-#include <gdk/gdkversionmacros.h>
+#include <gdk/version/gdkversionmacros.h>
 
 G_BEGIN_DECLS
 

diff --git a/gdk/gdkframetimings.h b/gdk/gdkframetimings.h
index c3cfe184a59da7e87cd521ddbebfea3a54e8607d..e030f3c98ca73ed2498710929929ec3ab27e34ef 100644 (file)
--- a/gdk/gdkframetimings.h
+++ b/gdk/gdkframetimings.h
@@ -22,7 +22,7 @@
 #endif
 
 #include <glib-object.h>
-#include <gdk/gdkversionmacros.h>
+#include <gdk/version/gdkversionmacros.h>
 
 G_BEGIN_DECLS
 

diff --git a/gdk/gdkglcontext.h b/gdk/gdkglcontext.h
index 0f5abe8544bc435171e2909ea909569bb6e29f4c..101d4f88684be6b91e62a88e38145824dea98bf0 100644 (file)
--- a/gdk/gdkglcontext.h
+++ b/gdk/gdkglcontext.h
@@ -26,7 +26,7 @@
 
 #include <gdk/gdkenums.h>
 #include <gdk/gdktypes.h>
-#include <gdk/gdkversionmacros.h>
+#include <gdk/version/gdkversionmacros.h>
 
 G_BEGIN_DECLS
 

diff --git a/gdk/gdkgltexturebuilder.h b/gdk/gdkgltexturebuilder.h
index 042bcc96cb49dfc7984ad87b4ae120e0a6753bab..acac39cd906e00566e55fc67f0fbdcce1b89ee76 100644 (file)
--- a/gdk/gdkgltexturebuilder.h
+++ b/gdk/gdkgltexturebuilder.h
@@ -25,7 +25,7 @@
 
 #include <gdk/gdkenums.h>
 #include <gdk/gdktypes.h>
-#include <gdk/gdkversionmacros.h>
+#include <gdk/version/gdkversionmacros.h>
 
 G_BEGIN_DECLS
 

diff --git a/gdk/gdkkeys.h b/gdk/gdkkeys.h
index dd82c938dd96b637a771c63b755c4de34ab77116..48158799d69939add18b54ddc132ce6cd253ba64 100644 (file)
--- a/gdk/gdkkeys.h
+++ b/gdk/gdkkeys.h
@@ -28,7 +28,7 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
-#include <gdk/gdkversionmacros.h>
+#include <gdk/version/gdkversionmacros.h>
 #include <gdk/gdktypes.h>
 
 G_BEGIN_DECLS

diff --git a/gdk/gdkmonitor.h b/gdk/gdkmonitor.h
index ed199cba087b2115f4bef9530981e0811a6ce067..9d304fd5034ec2f4f6269d8a55c2055bd7b7c983 100644 (file)
--- a/gdk/gdkmonitor.h
+++ b/gdk/gdkmonitor.h
@@ -25,7 +25,7 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
-#include <gdk/gdkversionmacros.h>
+#include <gdk/version/gdkversionmacros.h>
 #include <gdk/gdkrectangle.h>
 #include <gdk/gdktypes.h>
 

diff --git a/gdk/gdkpaintable.h b/gdk/gdkpaintable.h
index c5c3afc325936aa68de51afaae0015f5907682cc..27ac5609c264046bbae492d409af7793f1bebf16 100644 (file)
--- a/gdk/gdkpaintable.h
+++ b/gdk/gdkpaintable.h
@@ -24,7 +24,7 @@
 #endif
 
 #include <gdk/gdktypes.h>
-#include <gdk/gdkversionmacros.h>
+#include <gdk/version/gdkversionmacros.h>
 
 G_BEGIN_DECLS
 

diff --git a/gdk/gdkpango.h b/gdk/gdkpango.h
index 806597df2a258b34493dd7f895abe9307e153efd..fafae5459a9bb4f1567444e261a3d6fe1745ed25 100644 (file)
--- a/gdk/gdkpango.h
+++ b/gdk/gdkpango.h
@@ -22,7 +22,7 @@
 #endif
 
 #include <gdk/gdktypes.h>
-#include <gdk/gdkversionmacros.h>
+#include <gdk/version/gdkversionmacros.h>
 
 G_BEGIN_DECLS
 

diff --git a/gdk/gdkpipeiostreamprivate.h b/gdk/gdkpipeiostreamprivate.h
index e88154e03852553bd709d21d5e7a25296e368e55..79b47c3d199fb75b044729fb90a0a64c316bd4ff 100644 (file)
--- a/gdk/gdkpipeiostreamprivate.h
+++ b/gdk/gdkpipeiostreamprivate.h
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <gdk/gdkversionmacros.h>
+#include <gdk/version/gdkversionmacros.h>
 #include <gio/gio.h>
 
 G_BEGIN_DECLS

diff --git a/gdk/gdkpixbuf.h b/gdk/gdkpixbuf.h
index b05a27993537f2f001b292e03ee3da89db28c46b..664c8d24d699414d69ded2320f061f3cd82fec35 100644 (file)
--- a/gdk/gdkpixbuf.h
+++ b/gdk/gdkpixbuf.h
@@ -31,7 +31,7 @@
 #include <cairo.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gdk/gdktypes.h>
-#include <gdk/gdkversionmacros.h>
+#include <gdk/version/gdkversionmacros.h>
 #include <gdk/gdktexture.h>
 
 

diff --git a/gdk/gdkpopuplayout.h b/gdk/gdkpopuplayout.h
index 34a58c5850396ac58dbde6f954a059c462a90c78..f9e4b3b754ce6a09db60bc6d6d8d01cae4df25af 100644 (file)
--- a/gdk/gdkpopuplayout.h
+++ b/gdk/gdkpopuplayout.h
@@ -24,7 +24,7 @@
 
 #include <gdk/gdkenums.h>
 #include <gdk/gdktypes.h>
-#include <gdk/gdkversionmacros.h>
+#include <gdk/version/gdkversionmacros.h>
 
 G_BEGIN_DECLS
 

diff --git a/gdk/gdkprofiler.c b/gdk/gdkprofiler.c
index b51cd7eb37a6293013e84fe8ad3fb97f1f0cce51..9e456efeae8a65d77b4e2d8f9a19198f83a8dd7b 100644 (file)
--- a/gdk/gdkprofiler.c
+++ b/gdk/gdkprofiler.c
@@ -29,7 +29,7 @@
 #include <unistd.h>
 #endif
 
-#include "gdkversionmacros.h"
+#include "version/gdkversionmacros.h"
 #include "gdkframeclockprivate.h"
 
 

diff --git a/gdk/gdkrectangle.h b/gdk/gdkrectangle.h
index e3325aee23c4550c8537835bfdd106e20e23f08f..8033a2fe09ade1bea60f0e76ae7fa4d6512df631 100644 (file)
--- a/gdk/gdkrectangle.h
+++ b/gdk/gdkrectangle.h
@@ -29,7 +29,7 @@
 #endif
 
 #include <gdk/gdktypes.h>
-#include <gdk/gdkversionmacros.h>
+#include <gdk/version/gdkversionmacros.h>
 
 G_BEGIN_DECLS
 

diff --git a/gdk/gdkrgba.h b/gdk/gdkrgba.h
index b8aca3dab904af53446c014f488072cf2f19f299..716a1f0d04d1c6fbde8eca28d06fd38b15005a24 100644 (file)
--- a/gdk/gdkrgba.h
+++ b/gdk/gdkrgba.h
@@ -29,7 +29,7 @@
 #endif
 
 #include <gdk/gdktypes.h>
-#include <gdk/gdkversionmacros.h>
+#include <gdk/version/gdkversionmacros.h>
 
 G_BEGIN_DECLS
 

diff --git a/gdk/gdksnapshot.h b/gdk/gdksnapshot.h
index 31e0755bf4b7c5f8df7c4c94c0e56396f2b245fd..b0c31ad5a66b8d12aa981b7d8197fa6ff2eb079f 100644 (file)
--- a/gdk/gdksnapshot.h
+++ b/gdk/gdksnapshot.h
@@ -24,7 +24,7 @@
 #endif
 
 #include <gdk/gdktypes.h>
-#include <gdk/gdkversionmacros.h>
+#include <gdk/version/gdkversionmacros.h>
 
 G_BEGIN_DECLS
 

diff --git a/gdk/gdksurface.h b/gdk/gdksurface.h
index 5e215b52d59ffa436ec54f75a5b74f813d149a07..39ce04f979cd35e38f9f5aecaf9c0d65b9024844 100644 (file)
--- a/gdk/gdksurface.h
+++ b/gdk/gdksurface.h
@@ -28,7 +28,7 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
-#include <gdk/gdkversionmacros.h>
+#include <gdk/version/gdkversionmacros.h>
 #include <gdk/gdktypes.h>
 #include <gdk/gdkevents.h>
 #include <gdk/gdkframeclock.h>

diff --git a/gdk/gdktexture.h b/gdk/gdktexture.h
index c79904420e1caaa3a4fbd9a6c60cbef88362ef9a..3b3f312419e6b8bebffceb9af57d6394cb9bdb86 100644 (file)
--- a/gdk/gdktexture.h
+++ b/gdk/gdktexture.h
@@ -22,7 +22,7 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
-#include <gdk/gdkversionmacros.h>
+#include <gdk/version/gdkversionmacros.h>
 #include <gdk/gdkenums.h>
 #include <gdk/gdktypes.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>

diff --git a/gdk/gdktexturedownloader.h b/gdk/gdktexturedownloader.h
index 31d97ef17bd2a5e87f9a91628d0af4550cdde8f7..1c439c6d0ec0399ba429b276b470653f10ee7008 100644 (file)
--- a/gdk/gdktexturedownloader.h
+++ b/gdk/gdktexturedownloader.h
@@ -22,7 +22,7 @@
 #endif
 
 
-#include <gdk/gdkversionmacros.h>
+#include <gdk/version/gdkversionmacros.h>
 #include <gdk/gdkenums.h>
 #include <gdk/gdktypes.h>
 

diff --git a/gdk/gdktoplevellayout.h b/gdk/gdktoplevellayout.h
index aa2e1046d718baa877ba825e6b0e5f37f40468ad..3e3f2ea11835d700f2bbf004ae806a7b746d39a2 100644 (file)
--- a/gdk/gdktoplevellayout.h
+++ b/gdk/gdktoplevellayout.h
@@ -24,7 +24,7 @@
 
 #include <gdk/gdkmonitor.h>
 #include <gdk/gdktypes.h>
-#include <gdk/gdkversionmacros.h>
+#include <gdk/version/gdkversionmacros.h>
 
 G_BEGIN_DECLS
 

diff --git a/gdk/gdktoplevelsize.h b/gdk/gdktoplevelsize.h
index 536b1a34eb5caa9419d9f20083b834885a8c7795..c5e1b5c6c73873940d3c059ddacc6ea8b137c56d 100644 (file)
--- a/gdk/gdktoplevelsize.h
+++ b/gdk/gdktoplevelsize.h
@@ -23,7 +23,7 @@
 #endif
 
 #include <gdk/gdktypes.h>
-#include <gdk/gdkversionmacros.h>
+#include <gdk/version/gdkversionmacros.h>
 
 G_BEGIN_DECLS
 

diff --git a/gdk/gdktypes.h b/gdk/gdktypes.h
index 8cd6eff6e4964d98c44ce4b7745a026f6b4252b4..e54ae74f0b8e11eef87ea88c64a887a01a38c722 100644 (file)
--- a/gdk/gdktypes.h
+++ b/gdk/gdktypes.h
@@ -42,7 +42,7 @@
  * (or GTK). One such setting is what windowing API backend is in use.
  */
 #include <gdk/gdkconfig.h>
-#include <gdk/gdkversionmacros.h>
+#include <gdk/version/gdkversionmacros.h>
 
 G_BEGIN_DECLS
 

diff --git a/gdk/gdkversionmacros.h b/gdk/gdkversionmacros.h
deleted file mode 100644 (file)
index 934e391..0000000
--- a/gdk/gdkversionmacros.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <gdk/version/gdkversionmacros.h>
-#include <gdk/version/gdk-visibility.h>

diff --git a/gdk/gdkvulkancontext.h b/gdk/gdkvulkancontext.h
index d6531a414a14a7472207ba92470b52e3aed625dd..b1b3dc1e522be67b012347eb6a3432331c9477d4 100644 (file)
--- a/gdk/gdkvulkancontext.h
+++ b/gdk/gdkvulkancontext.h
@@ -24,7 +24,7 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
-#include <gdk/gdkversionmacros.h>
+#include <gdk/version/gdkversionmacros.h>
 #include <gdk/gdktypes.h>
 
 #ifdef GDK_RENDERING_VULKAN

diff --git a/gdk/meson.build b/gdk/meson.build
index a07f914b25a795747cbb9d26b02a8f97eb70704a..77d0fbd293dbf488f82faa092c2e6982c6467a21 100644 (file)
--- a/gdk/meson.build
+++ b/gdk/meson.build
@@ -110,7 +110,6 @@ gdk_public_headers = files([
   'gdktoplevelsize.h',
   'gdktoplevel.h',
   'gdkdragsurface.h',
-  'gdkversionmacros.h'
 ])
 install_headers(gdk_public_headers, subdir: 'gtk-4.0/gdk/')
 
@@ -147,7 +146,7 @@ gdk_enums = gnome.mkenums_simple('gdkenumtypes',
   sources: gdk_public_headers,
   decorator: 'GDK_AVAILABLE_IN_ALL',
   body_prefix: '#include "config.h"',
-  header_prefix: '#include "version/gdkversionmacros.h"\n#include "version/gdk-visibility.h"',
+  header_prefix: '#include "version/gdkversionmacros.h"\n',
   install_dir: gtk_includedir / 'gtk-4.0/gdk',
   install_header: true,
 )

diff --git a/gdk/version/gdkversionmacros.h.in b/gdk/version/gdkversionmacros.h.in
index c457b9262eb84912b1317f701d9ced9368b0eebf..b8b45385730052e9a4f1b99e108af94ffa4ba3ec 100644 (file)
--- a/gdk/version/gdkversionmacros.h.in
+++ b/gdk/version/gdkversionmacros.h.in
@@ -144,4 +144,6 @@
 # error "GDK_VERSION_MIN_REQUIRED must be >= GDK_VERSION_4_0"
 #endif
 
+#include <gdk/version/gdk-visibility.h>
+
 #endif  /* __GDK_VERSION_MACROS_H__ */

diff --git a/gtk/css/gtkcss.h b/gtk/css/gtkcss.h
index 6c4082e0972ffcec779bd0e7fa4601301b9e8bf4..04c16a901d88d3151d3ef12a7b3783a714ce79e0 100644 (file)
--- a/gtk/css/gtkcss.h
+++ b/gtk/css/gtkcss.h
@@ -27,7 +27,7 @@
 #define __GTK_CSS_H_INSIDE__
 
 #include <glib.h>
-#include <gdk/gdkversionmacros.h>
+#include <gdk/version/gdkversionmacros.h>
 
 #include <gtk/css/gtkcssenums.h>
 #include <gtk/css/gtkcssenumtypes.h>

diff --git a/gtk/css/gtkcssenums.h b/gtk/css/gtkcssenums.h
index f9584c549850db7d92908ee10e7bd1770cb9245a..396a422a0da9bcdc1da568d3c3150482de012068 100644 (file)
--- a/gtk/css/gtkcssenums.h
+++ b/gtk/css/gtkcssenums.h
@@ -29,7 +29,7 @@
 #endif
 
 #include <glib.h>
-#include <gdk/gdkversionmacros.h>
+#include <gdk/version/gdkversionmacros.h>
 
 /**
  * GtkCssParserError:

diff --git a/gtk/css/gtkcssenumtypes.h.template b/gtk/css/gtkcssenumtypes.h.template
index 53471b92c05e309bf8314b0444beca5a6e809bbb..90b83748cc0d88df231c867e6fa0d71a5eff2bb1 100644 (file)
--- a/gtk/css/gtkcssenumtypes.h.template
+++ b/gtk/css/gtkcssenumtypes.h.template
@@ -7,7 +7,7 @@
 #endif
 
 #include <glib-object.h>
-#include <gdk/gdkversionmacros.h>
+#include <gdk/version/gdkversionmacros.h>
 
 G_BEGIN_DECLS
 /*** END file-header ***/

diff --git a/gtk/css/gtkcsserror.h b/gtk/css/gtkcsserror.h
index b77a3f4002f591496a157ca96f5951757fc4558c..f2160f19c779c042bf8e0516b25cc5a66deabc55 100644 (file)
--- a/gtk/css/gtkcsserror.h
+++ b/gtk/css/gtkcsserror.h
@@ -21,7 +21,7 @@
 #pragma once
 
 #include <glib.h>
-#include <gdk/gdkversionmacros.h>
+#include <gdk/version/gdkversionmacros.h>
 
 G_BEGIN_DECLS
 

diff --git a/gtk/css/gtkcsssection.h b/gtk/css/gtkcsssection.h
index 782d44f5f3995d8552c6474430fb13ccebe6113f..163c032902b5d7cbdc55f304b04961130fa6494d 100644 (file)
--- a/gtk/css/gtkcsssection.h
+++ b/gtk/css/gtkcsssection.h
@@ -22,7 +22,7 @@
 #endif
 
 #include <gio/gio.h>
-#include <gdk/gdkversionmacros.h>
+#include <gdk/version/gdkversionmacros.h>
 #include <gtk/css/gtkcsslocation.h>
 
 G_BEGIN_DECLS