Commit 300de2b8 authored by Aaron M. Ucko's avatar Aaron M. Ucko

Fix builds with GCC 6. (Closes: #811968.)

* debian/libfltk1.1.symbols: Mark one symbol newly elided by GCC 6 as
  optional.
* src/fl_draw.cxx: Move the min macro's definition down, to ensure no
  headers have the opportunity to undefine it.
parent 47c26d09
fltk1.1 (1.1.10-21) UNRELEASED; urgency=medium
* NOT YET RELEASED.
* debian/libfltk1.1.symbols: Mark one symbol newly elided by GCC 6 as
optional. (With the below, Closes: #811968.)
* src/fl_draw.cxx: Move the min macro's definition down, to ensure no
headers have the opportunity to undefine it.
-- Aaron M. Ucko <ucko@debian.org> Sun, 14 Feb 2016 17:33:56 -0500
-- Aaron M. Ucko <ucko@debian.org> Sun, 14 Feb 2016 17:39:53 -0500
fltk1.1 (1.1.10-20) unstable; urgency=medium
......
......@@ -273,7 +273,7 @@ libfltk.so.1.1 libfltk1.1 #MINVER#
_ZN11Fl_Browser_9replacingEPvS0_@Base 1.1.6
(optional)_ZN11Fl_Browser_C1EiiiiPKc@Base 1.1.6
_ZN11Fl_Browser_C2EiiiiPKc@Base 1.1.6
_ZN11Fl_Browser_D0Ev@Base 1.1.6
(optional)_ZN11Fl_Browser_D0Ev@Base 1.1.6
(optional)_ZN11Fl_Browser_D1Ev@Base 1.1.6
(optional)_ZN11Fl_Browser_D2Ev@Base 1.1.9-3~
_ZN11Fl_FontSizeC1EPKc@Base 1.1.6
......
......@@ -941,3 +941,21 @@ Combined patches from git.
$(POSTBUILD) $@ ../FL/mac.r
gl_overlay$(EXEEXT): gl_overlay.o
--- fltk1.1-1.1.10.orig/src/fl_draw.cxx
+++ fltk1.1-1.1.10/src/fl_draw.cxx
@@ -32,7 +32,6 @@
// Expands all unprintable characters to ^X or \nnn notation
// Aligns them against the inside of the box.
-#define min(a,b) ((a)<(b)?(a):(b))
#include <FL/fl_draw.H>
#include <FL/Fl_Image.H>
@@ -40,6 +39,7 @@
#include <ctype.h>
#include <math.h>
+#define min(a,b) ((a)<(b)?(a):(b))
#define MAXBUF 1024
char fl_draw_shortcut; // set by fl_labeltypes.cxx
......@@ -32,7 +32,6 @@
// Expands all unprintable characters to ^X or \nnn notation
// Aligns them against the inside of the box.
#define min(a,b) ((a)<(b)?(a):(b))
#include <FL/fl_draw.H>
#include <FL/Fl_Image.H>
......@@ -40,6 +39,7 @@
#include <ctype.h>
#include <math.h>
#define min(a,b) ((a)<(b)?(a):(b))
#define MAXBUF 1024
char fl_draw_shortcut; // set by fl_labeltypes.cxx
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment