diff options
| author | Andrew Innes | 2000-08-22 22:50:55 +0000 |
|---|---|---|
| committer | Andrew Innes | 2000-08-22 22:50:55 +0000 |
| commit | cc26af7500300b129263b51a5f9dd2379ed74e4a (patch) | |
| tree | 7a9d8ad75801c521edf82f542b9f8a9ca13141b7 /src | |
| parent | 2506008079af8ecc029569d641aabe89b3d9df61 (diff) | |
| download | emacs-cc26af7500300b129263b51a5f9dd2379ed74e4a.tar.gz emacs-cc26af7500300b129263b51a5f9dd2379ed74e4a.zip | |
(search_file_line):
(set_bdf_font_info):
(seek_char):
(w32_get_bdf_glyph):
(w32_BDF_to_x_font): Fix compile warnings.
Diffstat (limited to 'src')
| -rw-r--r-- | src/w32bdf.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/w32bdf.c b/src/w32bdf.c index 932c874356f..c41ecd07220 100644 --- a/src/w32bdf.c +++ b/src/w32bdf.c | |||
| @@ -49,7 +49,7 @@ static int | |||
| 49 | search_file_line(char *key, char *start, int len, char **val, char **next) | 49 | search_file_line(char *key, char *start, int len, char **val, char **next) |
| 50 | { | 50 | { |
| 51 | int linelen; | 51 | int linelen; |
| 52 | unsigned char *p, *q; | 52 | char *p; |
| 53 | 53 | ||
| 54 | p = memchr(start, '\n', len); | 54 | p = memchr(start, '\n', len); |
| 55 | if (!p) return -1; | 55 | if (!p) return -1; |
| @@ -107,7 +107,7 @@ get_quoted_string(char *start, char *end) | |||
| 107 | static int | 107 | static int |
| 108 | set_bdf_font_info(bdffont *fontp) | 108 | set_bdf_font_info(bdffont *fontp) |
| 109 | { | 109 | { |
| 110 | unsigned char *start, *p, *q; | 110 | char *start, *p, *q; |
| 111 | int len, flag; | 111 | int len, flag; |
| 112 | int bbw, bbh, bbx, bby; | 112 | int bbw, bbh, bbx, bby; |
| 113 | int val1; | 113 | int val1; |
| @@ -345,7 +345,8 @@ seek_char(bdffont *fontp, int index) | |||
| 345 | { | 345 | { |
| 346 | font_char *result; | 346 | font_char *result; |
| 347 | int len, flag, font_index; | 347 | int len, flag, font_index; |
| 348 | unsigned char *start, *p, *q; | 348 | unsigned char *start; |
| 349 | char *p, *q; | ||
| 349 | 350 | ||
| 350 | if (!fontp->seeked) return NULL; | 351 | if (!fontp->seeked) return NULL; |
| 351 | 352 | ||
| @@ -379,8 +380,9 @@ int | |||
| 379 | w32_get_bdf_glyph(bdffont *fontp, int index, int size, glyph_struct *glyph) | 380 | w32_get_bdf_glyph(bdffont *fontp, int index, int size, glyph_struct *glyph) |
| 380 | { | 381 | { |
| 381 | font_char *pch; | 382 | font_char *pch; |
| 382 | unsigned char *start, *p, *q, *bitmapp; | 383 | unsigned char *start, *bitmapp; |
| 383 | unsigned char val1, val2; | 384 | char *p, *q; |
| 385 | char val1, val2; | ||
| 384 | int i, j, len, flag; | 386 | int i, j, len, flag; |
| 385 | 387 | ||
| 386 | pch = get_cached_font_char(fontp, index); | 388 | pch = get_cached_font_char(fontp, index); |
| @@ -692,7 +694,7 @@ int w32_BDF_to_x_font (char *file, char* xstr, int len) | |||
| 692 | { | 694 | { |
| 693 | HANDLE hfile, hfilemap; | 695 | HANDLE hfile, hfilemap; |
| 694 | BY_HANDLE_FILE_INFORMATION fileinfo; | 696 | BY_HANDLE_FILE_INFORMATION fileinfo; |
| 695 | unsigned char *font, *start, *p, *q; | 697 | char *font, *start, *p, *q; |
| 696 | int flag, size, retval = 0; | 698 | int flag, size, retval = 0; |
| 697 | 699 | ||
| 698 | hfile = CreateFile (file, GENERIC_READ, FILE_SHARE_READ, NULL, | 700 | hfile = CreateFile (file, GENERIC_READ, FILE_SHARE_READ, NULL, |