From cb86a37676e26a8de209a371132d8154986b457a Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Sat, 29 Mar 2025 21:03:18 +0100 Subject: Allow FL_ABI_VERSION = FL_API_VERSION + 1 ... so users can enable ABI features designated for the *next* release when using FLTK from Git (or snapshots) before the API version has been raised for that release. --- FL/Enumerations.H | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'FL') diff --git a/FL/Enumerations.H b/FL/Enumerations.H index 1a8b219bd..2478a8c58 100644 --- a/FL/Enumerations.H +++ b/FL/Enumerations.H @@ -153,11 +153,15 @@ This is done to prevent users from defining an illegal ABI version. Rule: FL_MAJOR_VERSION * 10000 + FL_MINOR_VERSION * 100 - <= FL_ABI_VERSION <= FL_API_VERSION. + <= FL_ABI_VERSION <= FL_API_VERSION + 1. - Example (FLTK 1.3.4): + Since FLTK 1.4.2+ (Git commits after release 1.4.2) FL_ABI_VERSION is + allowed to be one higher than FL_API_VERSION so ABI changes in Git + targeted at the *next* release (e.g. 1.4.3) can be used. - 10300 <= FL_ABI_VERSION <= 10304 + Example: Commits after release FLTK 1.4.2 (before release 1.4.3): + + 10400 <= FL_ABI_VERSION <= 10403 Note: configure + CMake can be used to define FL_ABI_VERSION, but they do not check validity. This is done here. @@ -168,10 +172,10 @@ # undef FL_ABI_VERSION # define FL_ABI_VERSION (FL_MAJOR_VERSION*10000 + FL_MINOR_VERSION*100) -#elif FL_ABI_VERSION > FL_API_VERSION +#elif FL_ABI_VERSION > FL_API_VERSION + 1 # undef FL_ABI_VERSION -# define FL_ABI_VERSION FL_API_VERSION +# define FL_ABI_VERSION FL_API_VERSION + 1 #endif -- cgit v1.2.3