Author: AlbrechtS
Date: 2011-01-11 12:52:38 -0800 (Tue, 11 Jan 2011)
New Revision: 8263
Log:
Fixed a few GNU compiler warnings (-pedantic): C++ comments in C files,
extraneous ';' and ',' and an invalid cast.
Modified:
branches/branch-1.3/FL/Fl_Native_File_Chooser_FLTK.H
branches/branch-1.3/src/fl_utf.c
branches/branch-1.3/src/xutf8/ucs2fontmap.c
branches/branch-1.3/test/device.cxx
branches/branch-1.3/test/preferences.fl
Modified: branches/branch-1.3/FL/Fl_Native_File_Chooser_FLTK.H
===================================================================
--- branches/branch-1.3/FL/Fl_Native_File_Chooser_FLTK.H 2011-01-11
20:50:36 UTC (rev 8262)
+++ branches/branch-1.3/FL/Fl_Native_File_Chooser_FLTK.H 2011-01-11
20:52:38 UTC (rev 8263)
@@ -3,7 +3,7 @@
//
// FLTK native OS file chooser widget
//
-// Copyright 1998-2010 by Bill Spitzak and others.
+// Copyright 1998-2011 by Bill Spitzak and others.
// Copyright 2005 by Nathan Vander Wilt.
//
// This library is free software; you can redistribute it and/or
@@ -93,7 +93,7 @@
NO_OPTIONS = 0x0000, ///< no options enabled
SAVEAS_CONFIRM = 0x0001, ///< Show native 'Save As' overwrite
confirm dialog (if supported)
NEW_FOLDER = 0x0002, ///< Show 'New Folder' icon (if
supported)
- PREVIEW = 0x0004, ///< enable preview mode
+ PREVIEW = 0x0004 ///< enable preview mode
};
private:
int _btype; // kind-of browser to show()
Modified: branches/branch-1.3/src/fl_utf.c
===================================================================
--- branches/branch-1.3/src/fl_utf.c 2011-01-11 20:50:36 UTC (rev 8262)
+++ branches/branch-1.3/src/fl_utf.c 2011-01-11 20:52:38 UTC (rev 8263)
@@ -3,7 +3,7 @@
*
* This is the utf.c file from fltk2 adapted for use in my fltk1.1 port
*/
-/* Copyright 2006-2010 by Bill Spitzak and others.
+/* Copyright 2006-2011 by Bill Spitzak and others.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -751,7 +751,7 @@
memcpy(dst, src, srclen);
dst[srclen] = 0;
} else {
- // Buffer insufficent or buffer query
+ /* Buffer insufficent or buffer query */
}
return srclen;
}
@@ -815,7 +815,7 @@
memcpy(dst, src, srclen);
dst[srclen] = 0;
} else {
- // Buffer insufficent or buffer query
+ /* Buffer insufficent or buffer query */
}
return srclen;
}
Modified: branches/branch-1.3/src/xutf8/ucs2fontmap.c
===================================================================
--- branches/branch-1.3/src/xutf8/ucs2fontmap.c 2011-01-11 20:50:36 UTC (rev
8262)
+++ branches/branch-1.3/src/xutf8/ucs2fontmap.c 2011-01-11 20:52:38 UTC (rev
8263)
@@ -36,7 +36,7 @@
unsigned short used;
} Summary16;
-#define NEED_TOMB // indicates what part of these include files is needed here
(avoid compilation warnings)
+#define NEED_TOMB /* indicates what part of these include files is needed here
(avoid compilation warnings) */
#include "lcUniConv/cp936ext.h"
#include "lcUniConv/big5.h"
#include "lcUniConv/gb2312.h"
@@ -305,7 +305,7 @@
break;
};
return -1;
-};
+}
/*const*/
int encoding_number(const char *enc) {
@@ -373,7 +373,7 @@
return 26;
};
return -1;
-};
+}
/*
* End of "$Id$".
Modified: branches/branch-1.3/test/device.cxx
===================================================================
--- branches/branch-1.3/test/device.cxx 2011-01-11 20:50:36 UTC (rev 8262)
+++ branches/branch-1.3/test/device.cxx 2011-01-11 20:52:38 UTC (rev 8263)
@@ -608,7 +608,7 @@
p->end_job();
}
delete p;
-};
+}
/*void print2(Fl_Widget *, void *w) {
Fl_Widget * g = (Fl_Widget *)w;
@@ -731,4 +731,4 @@
Fl::run();
return 0;
-};
+}
Modified: branches/branch-1.3/test/preferences.fl
===================================================================
--- branches/branch-1.3/test/preferences.fl 2011-01-11 20:50:36 UTC (rev
8262)
+++ branches/branch-1.3/test/preferences.fl 2011-01-11 20:52:38 UTC (rev
8263)
@@ -323,6 +323,6 @@
/* sample code only: */
unsigned int hex = 0x2387efcd;
eat.set( "binFoo", (void*)&hex, sizeof( unsigned int ) );
- eat.set( "binFoo2", (void*)&writePrefs, 256 );} {selected
+ eat.set( "binFoo2", (void*)&bed, 256 );} {selected
}
}
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
