diff options
| -rw-r--r-- | debian/patches/debian-changes | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes index 0856f87..6b9ddd4 100644 --- a/debian/patches/debian-changes +++ b/debian/patches/debian-changes @@ -818,6 +818,24 @@ Combined patches from git. $(RM) libfltk_gl.sl $(LN) libfltk_gl.sl.1.1 libfltk_gl.sl +--- 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 --- fltk1.1-1.1.10.orig/src/fl_font_xft.cxx +++ fltk1.1-1.1.10/src/fl_font_xft.cxx @@ -90,7 +90,7 @@ Fl_Fontdesc* fl_fonts = built_in_table; @@ -941,21 +959,3 @@ 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 |