Skip to content

Commit 1672288

Browse files
author
mike
committed
Added MacOS X 10.4.x + GCC 4.x fixes from 1.1.x branch.
git-svn-id: http://seriss.com/public/fltk/fltk/trunk@4370 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
1 parent 7698cce commit 1672288

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

configure.in

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -806,7 +806,9 @@ if test -n "$GCC"; then
806806
;;
807807
esac
808808

809-
CXX="$CC"
809+
if test x$uname != xDarwin; then
810+
CXX="$CC"
811+
fi
810812

811813
AC_ARG_ENABLE(exceptions, [ --enable-exceptions turn on GCC exceptions (default=yes)])
812814
if test x$enable_exceptions != xno; then

test/cursor.cxx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// "$Id: cursor.cxx,v 1.12 2002/12/10 02:01:04 easysw Exp $"
2+
// "$Id$"
33
//
44
// Cursor test program for the Fast Light Tool Kit (FLTK).
55
//
@@ -47,7 +47,7 @@ int CursorBox::handle(int event) {
4747
return Widget::handle(event);
4848
}
4949

50-
struct {const char* name; Cursor* cursor;} table[] = {
50+
struct gcc4_bug_workaround {const char* name; Cursor* cursor;} table[] = {
5151
{"0", 0},
5252
{"CURSOR_ARROW", CURSOR_ARROW},
5353
{"CURSOR_CROSS", CURSOR_CROSS},
@@ -63,7 +63,7 @@ struct {const char* name; Cursor* cursor;} table[] = {
6363
{"CURSOR_NO", CURSOR_NO},
6464
{"CURSOR_NONE", CURSOR_NONE},
6565
};
66-
#define COUNT (sizeof(table)/sizeof(*table))
66+
#define COUNT (sizeof(table)/sizeof(table[0]))
6767
#define W 200
6868
#define H 25
6969
#define GAP 5
@@ -79,5 +79,5 @@ int main(int argc, char **argv) {
7979
}
8080

8181
//
82-
// End of "$Id: cursor.cxx,v 1.12 2002/12/10 02:01:04 easysw Exp $".
82+
// End of "$Id$".
8383
//

0 commit comments

Comments
 (0)