projects
/
chise
/
xemacs-chise.git.1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(U+7F4F): Apply new conventions for glyph granularity.
[chise/xemacs-chise.git.1]
/
src
/
glyphs-msw.c
diff --git
a/src/glyphs-msw.c
b/src/glyphs-msw.c
index
80ef445
..
72902aa
100644
(file)
--- a/
src/glyphs-msw.c
+++ b/
src/glyphs-msw.c
@@
-1460,7
+1460,7
@@
in this Software without prior written authorization from the X Consortium.
/* shared data for the image read/parse logic */
static short hexTable[256]; /* conversion value */
/* shared data for the image read/parse logic */
static short hexTable[256]; /* conversion value */
-static int initialized = FALSE; /* easier to fill in at run time */
+static int hex_initialized = FALSE; /* easier to fill in at run time */
/*
* Table index for the hex values. Initialized once, first time.
/*
* Table index for the hex values. Initialized once, first time.
@@
-1494,7
+1494,7
@@
initHexTable (void)
hexTable['}'] = -1; hexTable['\n'] = -1;
hexTable['\t'] = -1;
hexTable['}'] = -1; hexTable['\n'] = -1;
hexTable['\t'] = -1;
- initialized = TRUE;
+ hex_initialized = TRUE;
}
/*
}
/*
@@
-1557,7
+1557,7
@@
int read_bitmap_data (FILE* fstream, unsigned int *width,
#define Xmalloc(size) malloc(size)
/* first time initialization */
#define Xmalloc(size) malloc(size)
/* first time initialization */
- if (initialized == FALSE) initHexTable();
+ if (hex_initialized == FALSE) initHexTable();
/* error cleanup and return macro */
#define RETURN(code) { if (data) free (data); return code; }
/* error cleanup and return macro */
#define RETURN(code) { if (data) free (data); return code; }
@@
-1903,7
+1903,7
@@
init_image_instance_from_xbm_inline (Lisp_Image_Instance *ii,
break;
default:
break;
default:
- abort ();
+ ABORT ();
}
}
}
}
@@
-1977,6
+1977,9
@@
mswindows_xbm_instantiate (Lisp_Object image_instance,
#ifdef __cplusplus
extern "C" {
#endif
#ifdef __cplusplus
extern "C" {
#endif
+#ifndef __STDC__ /* Needed to avoid prototype warnings */
+#define __STDC__
+#endif
#include <compface.h>
#ifdef __cplusplus
}
#include <compface.h>
#ifdef __cplusplus
}