33 lines
1.6 KiB
Diff
33 lines
1.6 KiB
Diff
|
diff -Nru fltk-1.1.9.orig/src/filename_list.cxx fltk-1.1.9/src/filename_list.cxx
|
||
|
|
--- fltk-1.1.9.orig/src/filename_list.cxx 2006-06-09 18:16:34.000000000 +0200
|
||
|
|
+++ fltk-1.1.9/src/filename_list.cxx 2009-07-01 14:25:03.841445929 +0200
|
||
|
|
@@ -67,7 +67,7 @@
|
||
|
|
// The vast majority of UNIX systems want the sort function to have this
|
||
|
|
// prototype, most likely so that it can be passed to qsort without any
|
||
|
|
// changes:
|
||
|
|
- int n = scandir(d, list, 0, (int(*)(const void*,const void*))sort);
|
||
|
|
+ int n = scandir(d, list, 0, (int(*)(const dirent **,const dirent **))sort);
|
||
|
|
#else
|
||
|
|
// This version is when we define our own scandir (WIN32 and perhaps
|
||
|
|
// some Unix systems) and apparently on IRIX:
|
||
|
|
diff -ru fltk-1.1.9.orig/src/fl_set_fonts_xft.cxx fltk-1.1.9/src/fl_set_fonts_xft.cxx
|
||
|
|
--- fltk-1.1.9.orig/src/fl_set_fonts_xft.cxx 2006-10-03 04:35:12.000000000 +0200
|
||
|
|
+++ fltk-1.1.9/src/fl_set_fonts_xft.cxx 2009-07-01 14:28:28.268210527 +0200
|
||
|
|
@@ -253,13 +253,13 @@
|
||
|
|
// So the bit we want is up to the first comma - BUT some strings have
|
||
|
|
// more than one name, separated by, guess what?, a comma...
|
||
|
|
stop = start = first = 0;
|
||
|
|
- stop = strchr((const char *)font, ',');
|
||
|
|
- start = strchr((const char *)font, ':');
|
||
|
|
+ stop = strchr((char *)font, ',');
|
||
|
|
+ start = strchr((char *)font, ':');
|
||
|
|
if ((stop) && (start) && (stop < start))
|
||
|
|
{
|
||
|
|
first = stop + 1; // discard first version of name
|
||
|
|
// find first comma *after* the end of the name
|
||
|
|
- stop = strchr((const char *)start, ',');
|
||
|
|
+ stop = strchr((char *)start, ',');
|
||
|
|
}
|
||
|
|
else
|
||
|
|
{
|