From b4c15eb8ae300eeb374f461a7788ec6dec7938f0 Mon Sep 17 00:00:00 2001
From: Albrecht Schlosser <albrechts.fltk@online.de>
Date: Tue, 11 Jan 2011 20:52:38 +0000
Subject: Fixed a few GNU compiler warnings (-pedantic): C++ comments in C
 files, extraneous ';' and ',' and an invalid cast.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8263 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/fl_utf.c            | 6 +++---
 src/xutf8/ucs2fontmap.c | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/fl_utf.c b/src/fl_utf.c
index 7e858c1e1..ff13404c0 100644
--- a/src/fl_utf.c
+++ b/src/fl_utf.c
@@ -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 @@ unsigned fl_utf8to_mb(const char* src, unsigned srclen,
     memcpy(dst, src, srclen);
     dst[srclen] = 0;
   } else {
-    // Buffer insufficent or buffer query
+    /* Buffer insufficent or buffer query */
   }
   return srclen;
 }
@@ -815,7 +815,7 @@ unsigned fl_utf8from_mb(char* dst, unsigned dstlen,
     memcpy(dst, src, srclen);
     dst[srclen] = 0;
   } else {
-    // Buffer insufficent or buffer query
+    /* Buffer insufficent or buffer query */
   }
   return srclen;
 }
diff --git a/src/xutf8/ucs2fontmap.c b/src/xutf8/ucs2fontmap.c
index 3f2175762..fe3150ba4 100644
--- a/src/xutf8/ucs2fontmap.c
+++ b/src/xutf8/ucs2fontmap.c
@@ -36,7 +36,7 @@ typedef struct {
   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 @@ int ucs2fontmap(char *s, unsigned int ucs, int enc) {
     break;
   };
   return -1;
-};
+}
 
 /*const*/
 int encoding_number(const char *enc) {
@@ -373,7 +373,7 @@ int encoding_number(const char *enc) {
     return 26;
   };
   return -1;
-};
+}
 
 /*
  * End of "$Id$".
-- 
cgit v1.2.3