Author: greg.ercolano
Date: 2012-05-26 15:51:07 -0700 (Sat, 26 May 2012)
New Revision: 9549
Log:
SGI fixes.
Modified:
branches/branch-1.3/src/flstring.c
branches/branch-1.3/src/flstring.h
branches/branch-1.3/src/xutf8/utf8Input.c
branches/branch-1.3/src/xutf8/utf8Wrap.c
Modified: branches/branch-1.3/src/flstring.c
===================================================================
--- branches/branch-1.3/src/flstring.c 2012-05-25 15:11:35 UTC (rev 9548)
+++ branches/branch-1.3/src/flstring.c 2012-05-26 22:51:07 UTC (rev 9549)
@@ -103,7 +103,7 @@
if (*s == *t) continue;
if (*s < *t) {
if ( (*s+0x20)!=*t || !C_RANGE(*s,'A','Z') ) return -1;
- } else { // *s > *t
+ } else { /* *s > *t */
if ( (*s-0x20)!=*t || !C_RANGE(*s,'a','z') ) return +1;
}
}
Modified: branches/branch-1.3/src/flstring.h
===================================================================
--- branches/branch-1.3/src/flstring.h 2012-05-25 15:11:35 UTC (rev 9548)
+++ branches/branch-1.3/src/flstring.h 2012-05-26 22:51:07 UTC (rev 9549)
@@ -84,7 +84,7 @@
# define strlcpy fl_strlcpy
# endif /* !HAVE_STRLCPY */
-// locale independent ascii compare, does not introduce locale pbs as w/ case
cmp
+/* locale independent ascii compare, does not introduce locale pbs as w/ case
cmp */
FL_EXPORT extern int fl_ascii_strcasecmp(const char *s, const char *t);
# ifdef __cplusplus
Modified: branches/branch-1.3/src/xutf8/utf8Input.c
===================================================================
--- branches/branch-1.3/src/xutf8/utf8Input.c 2012-05-25 15:11:35 UTC (rev
9548)
+++ branches/branch-1.3/src/xutf8/utf8Input.c 2012-05-26 22:51:07 UTC (rev
9549)
@@ -62,7 +62,7 @@
int i = 0;
#endif
int l = 0;
- char *buf; // , *b;
+ char *buf; /* , *b; */
if (len < 1) return 0;
/*b = */ buf = (char*) malloc((unsigned)len);
@@ -426,7 +426,7 @@
if (*keysym < 0x80) {
ucs = (unsigned char)buffer_return[0];
} else {
- ucs = *keysym;
+ ucs = (long)*keysym;
}
} else if (((*keysym >= 0x100 && *keysym <= 0xf000) ||
(*keysym & 0xff000000U) == 0x01000000))
Modified: branches/branch-1.3/src/xutf8/utf8Wrap.c
===================================================================
--- branches/branch-1.3/src/xutf8/utf8Wrap.c 2012-05-25 15:11:35 UTC (rev
9548)
+++ branches/branch-1.3/src/xutf8/utf8Wrap.c 2012-05-26 22:51:07 UTC (rev
9549)
@@ -230,10 +230,10 @@
XUtf8FontStruct *font_set) {
int i;
- //char **list;
+ /* char **list; */
i = 0;
- //list = NULL;
+ /* list = NULL; */
font_set->fonts = (XFontStruct**) malloc(sizeof(XFontStruct*) *
font_set->nb_font);
@@ -587,8 +587,8 @@
int ht = 0; /* used to find max height in text */
int hs; /* "height sum" of current text segment */
int yt = 0x7FFFFFFF; /* used to find bounding rectangle delta-y */
- // int res; /* result from calling XTextExtents16() - we should test this is
OK! */
- // FC: the man does not specify error codes for it, but X will generate X
errors like BadGC or BadFont.
+ /* int res; */ /* result from calling XTextExtents16() - we should test this
is OK! */
+ /* FC: the man does not specify error codes for it, but X will generate X
errors like BadGC or BadFont. */
XCharStruct sizes;
int dir_ret = 0;
@@ -821,19 +821,19 @@
XFontStruct **fnt,
unsigned short *id) {
- //int x;
+ /* int x; */
int *encodings; /* encodings array */
XFontStruct **fonts; /* fonts array */
int fnum; /* index of the current font in the fonts array*/
- //int i; /* current byte in the XChar2b buffer */
+ /* int i; */ /* current byte in the XChar2b buffer */
int first; /* first valid font index */
- //int last_fnum; /* font index of the previous char */
+ /* int last_fnum; */ /* font index of the previous char */
int nb_font; /* quantity of fonts in the font array */
char glyph[2]; /* byte1 and byte2 value of the UTF-8
char */
int *ranges; /* sub range of iso10646 */
nb_font = font_set->nb_font;
- //x = 0;
+ /* x = 0; */
if (nb_font < 1) {
/* there is no font in the font_set :-( */
@@ -843,7 +843,7 @@
ranges = font_set->ranges;
fonts = font_set->fonts;
encodings = font_set->encodings;
- //i = 0;
+ /* i = 0; */
fnum = 0;
while(fnum < nb_font && !fonts[fnum]) fnum++;
@@ -853,7 +853,7 @@
}
first = fnum;
- //last_fnum = fnum;
+ /* last_fnum = fnum; */
/*
* find the first encoding which can be used to
@@ -895,9 +895,9 @@
XFontStruct **fonts; /* fonts array */
Fl_XChar2b buf[8]; /* drawing buffer */
int fnum; /* index of the current font in the fonts array*/
- //int i; /* current byte in the XChar2b buffer */
+ /*int i;*/ /* current byte in the XChar2b buffer */
int first; /* first valid font index */
- //int last_fnum; /* font index of the previous char */
+ /*int last_fnum;*/ /* font index of the previous char */
int nb_font; /* quantity of fonts in the font array */
char glyph[2]; /* byte1 and byte2 value of the UTF-8 char
*/
int *ranges; /* sub range of iso10646 */
@@ -914,7 +914,7 @@
ranges = font_set->ranges;
fonts = font_set->fonts;
encodings = font_set->encodings;
- //i = 0;
+ /* i = 0; */
fnum = 0;
while(fnum < nb_font && !fonts[fnum]) fnum++;
@@ -924,7 +924,7 @@
}
first = fnum;
- //last_fnum = fnum;
+ /* last_fnum = fnum; */
no_spc = XUtf8IsNonSpacing(ucs);
if (no_spc) ucs = no_spc;
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
