fltk2: uClibc-0.9.31 fixes

git-svn-id: svn://svn.openwrt.org/openwrt/packages@23812 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
mb 2010-11-03 01:27:59 +00:00
parent 99f852de6f
commit 572dd50f92
2 changed files with 19 additions and 5 deletions

View File

@ -1,5 +1,7 @@
--- fltk2/makeinclude.in 2009-01-02 02:58:26.000000000 +0100
+++ fltk2/makeinclude.in 2009-01-02 02:56:49.000000000 +0100
Index: fltk2-r6671/makeinclude.in
===================================================================
--- fltk2-r6671.orig/makeinclude.in 2010-11-03 02:16:42.106000002 +0100
+++ fltk2-r6671/makeinclude.in 2010-11-03 02:16:43.163002267 +0100
@@ -54,6 +54,7 @@
# flags for C++ compiler:
@ -8,9 +10,7 @@
CFLAGS = $(OPTIM) @CFLAGS@
CXXFLAGS = $(OPTIM) @CXXFLAGS@
--- fltk2-r6542/makeinclude.in.orig 2009-01-02 02:33:29.000000000 +0100
+++ fltk2-r6542/makeinclude.in 2009-01-02 02:37:27.000000000 +0100
@@ -124,11 +124,11 @@
@@ -124,11 +125,11 @@
.c.o:
echo Compiling $<...

View File

@ -0,0 +1,14 @@
Index: fltk2-r6671/src/filename_list.cxx
===================================================================
--- fltk2-r6671.orig/src/filename_list.cxx 2010-11-03 02:17:17.243001500 +0100
+++ fltk2-r6671/src/filename_list.cxx 2010-11-03 02:24:13.400999350 +0100
@@ -62,6 +62,9 @@
// This version is when we define our own scandir (WIN32 and perhaps
// some Unix systems):
int n = scandir(d, list, 0, sort);
+#elif defined(__UCLIBC_MAJOR__) && \
+ __UCLIBC_MAJOR__ >= 0 && __UCLIBC_MINOR__ >= 9 && __UCLIBC_SUBLEVEL__ >= 31
+ int n = scandir(d, list, 0, (int(*)(const dirent **, const dirent **))sort);
#elif defined(__linux) || defined (__FreeBSD__) || defined (__NetBSD__)
int n = scandir(d, list, 0, (int(*)(const void*,const void*))sort);
#elif defined(__hpux) || defined(__CYGWIN__)