From 0158efd86f2a23624a26cdeb8e655f9f7f48a780 Mon Sep 17 00:00:00 2001
From: Jonathan Moore Liles <j.liles@unix.net>
Date: Tue, 23 Jul 2013 17:59:02 -0700
Subject: [PATCH] Change CFLAGS, clean up some compiler warnings.

---
 FL/Enumerations.H             |  2 +-
 src/Fl_x.cxx                  |  3 ++-
 src/xutf8/headers/dingbats_.h | 12 ++++++------
 src/xutf8/headers/symbol_.h   | 16 ++++++++--------
 wscript                       |  2 ++
 5 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/FL/Enumerations.H b/FL/Enumerations.H
index 3cc1739..b565851 100644
--- a/FL/Enumerations.H
+++ b/FL/Enumerations.H
@@ -938,7 +938,7 @@ enum Fl_Damage {
   FL_DAMAGE_OVERLAY  = 0x08, /**< The overlay planes need to be redrawn. */
   FL_DAMAGE_USER1    = 0x10, /**< First user-defined damage bit. */
   FL_DAMAGE_USER2    = 0x20, /**< Second user-defined damage bit. */
-  FL_DAMAGE_ALL      = 0x80,  /**< Everything needs to be redrawn. */
+  FL_DAMAGE_ALL      = 0x80  /**< Everything needs to be redrawn. */
 };
 
 // FLTK 1.0.x compatibility definitions...
diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx
index 2701a17..912fc93 100644
--- a/src/Fl_x.cxx
+++ b/src/Fl_x.cxx
@@ -1095,7 +1095,8 @@ static int fl_handle_xembed ( const XEvent &xevent )
             /* printf( "Got property notify.\n" ); */
             if ( xevent.xproperty.atom == fl_XEMBED_INFO )
             {
-                unsigned long version, flags;
+                unsigned long version = 0;
+      		unsigned long flags = 0;
 
                 xembed_get_info( xevent.xproperty.window, &version, &flags );
 
diff --git a/src/xutf8/headers/dingbats_.h b/src/xutf8/headers/dingbats_.h
index 9f1f225..06f9f43 100644
--- a/src/xutf8/headers/dingbats_.h
+++ b/src/xutf8/headers/dingbats_.h
@@ -1,6 +1,6 @@
 /* dingbats */
 
-static const char unicode_to_dingbats_1b_0020[] = {
+static const unsigned char unicode_to_dingbats_1b_0020[] = {
 /* U+0020 */ 0x20,
 0x00,
 0x00,
@@ -132,14 +132,14 @@ static const char unicode_to_dingbats_1b_0020[] = {
 /* U+00A0 */ 0x20,
 };
 
-static const char unicode_to_dingbats_1b_2192[] = {
+static const unsigned char unicode_to_dingbats_1b_2192[] = {
 /* U+2192 */ 0xD5,
 0x00,
 /* U+2194 */ 0xD6,
 /* U+2195 */ 0xD7,
 };
 
-static const char unicode_to_dingbats_1b_2460[] = {
+static const unsigned char unicode_to_dingbats_1b_2460[] = {
 /* U+2460 */ 0xAC,
 /* U+2461 */ 0xAD,
 /* U+2462 */ 0xAE,
@@ -152,7 +152,7 @@ static const char unicode_to_dingbats_1b_2460[] = {
 /* U+2469 */ 0xB5,
 };
 
-static const char unicode_to_dingbats_1b_25A0[] = {
+static const unsigned char unicode_to_dingbats_1b_25A0[] = {
 /* U+25A0 */ 0x6E,
 0x00,
 0x00,
@@ -354,7 +354,7 @@ static const char unicode_to_dingbats_1b_25A0[] = {
 /* U+2666 */ 0xA9,
 };
 
-static const char unicode_to_dingbats_1b_2701[] = {
+static const unsigned char unicode_to_dingbats_1b_2701[] = {
 /* U+2701 */ 0x21,
 /* U+2702 */ 0x22,
 /* U+2703 */ 0x23,
@@ -547,7 +547,7 @@ static const char unicode_to_dingbats_1b_2701[] = {
 /* U+27BE */ 0xFE,
 };
 
-static const char unicode_to_dingbats_1b_F8D7[] = {
+static const unsigned char unicode_to_dingbats_1b_F8D7[] = {
 /* U+F8D7 */ 0x80,
 /* U+F8D8 */ 0x81,
 /* U+F8D9 */ 0x82,
diff --git a/src/xutf8/headers/symbol_.h b/src/xutf8/headers/symbol_.h
index a9d8fd3..ab1c4f2 100644
--- a/src/xutf8/headers/symbol_.h
+++ b/src/xutf8/headers/symbol_.h
@@ -1,6 +1,6 @@
 /* symbol */
 
-static const char unicode_to_symbol_1b_0020[] = {
+static const unsigned char unicode_to_symbol_1b_0020[] = {
 /* U+0020 */ 0x20,
 /* U+0021 */ 0x21,
 0x00,
@@ -219,11 +219,11 @@ static const char unicode_to_symbol_1b_0020[] = {
 /* U+00F7 */ 0xB8,
 };
 
-static const char unicode_to_symbol_1b_0192[] = {
+static const unsigned char unicode_to_symbol_1b_0192[] = {
 /* U+0192 */ 0xA6,
 };
 
-static const char unicode_to_symbol_1b_0391[] = {
+static const unsigned char unicode_to_symbol_1b_0391[] = {
 /* U+0391 */ 0x41,
 /* U+0392 */ 0x42,
 /* U+0393 */ 0x47,
@@ -296,7 +296,7 @@ static const char unicode_to_symbol_1b_0391[] = {
 /* U+03D6 */ 0x76,
 };
 
-static const char unicode_to_symbol_1b_2022[] = {
+static const unsigned char unicode_to_symbol_1b_2022[] = {
 /* U+2022 */ 0xB7,
 0x00,
 0x00,
@@ -1076,11 +1076,11 @@ static const char unicode_to_symbol_1b_2022[] = {
 /* U+232A */ 0xF1,
 };
 
-static const char unicode_to_symbol_1b_25CA[] = {
+static const unsigned char unicode_to_symbol_1b_25CA[] = {
 /* U+25CA */ 0xE0,
 };
 
-static const char unicode_to_symbol_1b_2660[] = {
+static const unsigned char unicode_to_symbol_1b_2660[] = {
 /* U+2660 */ 0xAA,
 0x00,
 0x00,
@@ -1090,13 +1090,13 @@ static const char unicode_to_symbol_1b_2660[] = {
 /* U+2666 */ 0xA8,
 };
 
-static const char unicode_to_symbol_1b_F6D9[] = {
+static const unsigned char unicode_to_symbol_1b_F6D9[] = {
 /* U+F6D9 */ 0xD3,
 /* U+F6DA */ 0xD2,
 /* U+F6DB */ 0xD4,
 };
 
-static const char unicode_to_symbol_1b_F8E5[] = {
+static const unsigned char unicode_to_symbol_1b_F8E5[] = {
 /* U+F8E5 */ 0x60,
 /* U+F8E6 */ 0xBD,
 /* U+F8E7 */ 0xBE,
diff --git a/wscript b/wscript
index 0b25ec5..6dcfd0b 100644
--- a/wscript
+++ b/wscript
@@ -29,6 +29,8 @@ children = [ 'fluid', 'test' ]
 #children = []
 
 CFLAGS = [ '-pthread',
+	   '-ansi',
+	   '-pedantic',
            '-D_LARGEFILE64_SOURCE',
            '-D_FILE_OFFSET_BITS=64',
            '-D_GNU_SOURCE' ]