Skip to content

Commit

Permalink
Put ABI breaking changes under ABI guards (fltk#1139)
Browse files Browse the repository at this point in the history
This reverts the improvement of fltk#1139 in the default build which is
now only available with FL_ABI_VERSION=10401 or higher.

Users that need this improvement need to build with the required
ABI version by setting it with configure or CMake.
  • Loading branch information
Albrecht Schlosser committed Dec 12, 2024
1 parent 86eaf0f commit 0e6b20d
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
7 changes: 6 additions & 1 deletion FL/Fl_Graphics_Driver.H
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,12 @@ typedef struct _PangoFontDescription PangoFontDescription;
// See issue #1139: "FL_REGION_STACK_SIZE could be increased"
// and issue #1140: "Fix static array allocation".

#define FL_REGION_STACK_SIZE 64
#if FL_ABI_VERSION >= 10401
# define FL_REGION_STACK_SIZE 64
#else
# define FL_REGION_STACK_SIZE 10
#endif

#define FL_MATRIX_STACK_SIZE 32

/**
Expand Down
7 changes: 6 additions & 1 deletion FL/Fl_Help_View.H
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
//
// Copyright 1997-2010 by Easy Software Products.
// Image support by Matthias Melcher, Copyright 2000-2009.
// Copyright 2011-2022 by Bill Spitzak and others.
// Copyright 2011-2024 by Bill Spitzak and others.
//
// This library is free software. Distribution and use rights are outlined in
// the file "COPYING" which should have been included with this file. If this
Expand Down Expand Up @@ -225,7 +225,12 @@ class FL_EXPORT Fl_Help_View : public Fl_Group { // Help viewer widget
atargets_; ///< Allocated targets
Fl_Help_Target *targets_; ///< Targets

#if FL_ABI_VERSION >= 10401
char directory_[2 * FL_PATH_MAX + 15]; ///< Directory for current file
#else
char directory_[FL_PATH_MAX]; ///< Directory for current file
#endif

char filename_[FL_PATH_MAX]; ///< Current filename
int topline_, ///< Top line in document
leftline_, ///< Lefthand position
Expand Down

0 comments on commit 0e6b20d

Please sign in to comment.