From 5110b6289caca7a00288f53794e99b75d976ae9e Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Sun, 20 May 2012 12:42:23 +0000 Subject: cjkutils: Build fix for 64-bit Mac OS X 10.7.3 with clang git-svn-id: svn://tug.org/texlive/trunk@26503 c570f23f-e606-0410-a88d-b1316a301751 --- .../texk/cjkutils/cjkutils-4.8.3-PATCHES/ChangeLog | 7 + .../cjkutils-4.8.3-PATCHES/patch-01-static | 373 +++++++++++++++++++++ .../texk/cjkutils/cjkutils-4.8.3/hbf2gf/hbf2gf.w | 92 ++--- Build/source/texk/cjkutils/hbf2gf.c | 194 ++++++----- Build/source/texk/cjkutils/hbf2gf.dvi | Bin 183712 -> 184396 bytes Build/source/texk/cjkutils/hbf2gf.idx | 2 +- Build/source/texk/cjkutils/hbf2gf.tex | 128 +++---- 7 files changed, 601 insertions(+), 195 deletions(-) create mode 100644 Build/source/texk/cjkutils/cjkutils-4.8.3-PATCHES/patch-01-static (limited to 'Build/source') diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3-PATCHES/ChangeLog b/Build/source/texk/cjkutils/cjkutils-4.8.3-PATCHES/ChangeLog index be7e61a186e..c6b678cd7d8 100644 --- a/Build/source/texk/cjkutils/cjkutils-4.8.3-PATCHES/ChangeLog +++ b/Build/source/texk/cjkutils/cjkutils-4.8.3-PATCHES/ChangeLog @@ -1,3 +1,10 @@ +2012-05-20 Peter Breitenlohner + + * patch-01-static (new): Build fix for 64-bit Mac OS X 10.7.3. + Clang does not like non-static inline functions as used here. + While at it, all local functions are declared static. + Do not extend #ifdef HAVE_EMTEXDIR...#endif over several sections. + 2012-05-11 Peter Breitenlohner Imported cjk-4.8.3/utils source tree from: diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3-PATCHES/patch-01-static b/Build/source/texk/cjkutils/cjkutils-4.8.3-PATCHES/patch-01-static new file mode 100644 index 00000000000..f0bfeba60ba --- /dev/null +++ b/Build/source/texk/cjkutils/cjkutils-4.8.3-PATCHES/patch-01-static @@ -0,0 +1,373 @@ + Clang does not like non-static inline functions as used here. + While at it, all local functions are declared static. + + Do not extend #ifdef HAVE_EMTEXDIR...#endif over several sections. + +diff -ur cjkutils-4.8.3.orig/hbf2gf/hbf2gf.w cjkutils-4.8.3/hbf2gf/hbf2gf.w +--- cjkutils-4.8.3.orig/hbf2gf/hbf2gf.w 2012-05-07 00:00:00.000000000 +0200 ++++ cjkutils-4.8.3/hbf2gf/hbf2gf.w 2012-05-20 14:09:25.143819152 +0200 +@@ -427,7 +427,7 @@ + functions |write_pre()|, |write_data()|, and |write_post()| handle this. + + @= +-void write_file(void); ++static void write_file(void); + + + @ +@@ -435,7 +435,7 @@ + the \.{-n} option isn't specified; otherwise only `\.{.gf}' will be appended. + + @c +-void write_file(void) ++static void write_file(void) + {char output_file[FILE_NAME_LENGTH + 1]; + + +@@ -489,14 +489,14 @@ + @d header " hbf2gf output " + + @= +-void write_pre(void); ++static void write_pre(void); + + + @ + @s tm int + + @c +-void write_pre(void) ++static void write_pre(void) + {char out_s[40], s[20]; + time_t secs_now; + struct tm *time_now; +@@ -577,12 +577,12 @@ + + @ + @= +-void write_data(void); ++static void write_data(void); + + + @ + @c +-void write_data(void) ++static void write_data(void) + {dot_count = 0; + char_adr_p = char_adr;@# + +@@ -688,12 +688,12 @@ + \TeX\ defines that 72.27~points are exactly 1~inch. + + @= +-void write_post(void); ++static void write_post(void); + + + @ + @c +-void write_post(void) ++static void write_post(void) + {long special_adr; + long post_adr;@# + +@@ -832,12 +832,12 @@ + \TeX\ wants the most significant byte first. + + @= +-void fputl(long, FILE *); ++static void fputl(long, FILE *); + + + @ + @c +-void fputl(long num, FILE *f) ++static void fputl(long num, FILE *f) + {fputc(num >> 24, f); + fputc(num >> 16, f); + fputc(num >> 8, f); +@@ -992,12 +992,12 @@ + + + @= +-void make_pixel_array(void); ++static void make_pixel_array(void); + + + @ + @c +-void make_pixel_array(void) ++static void make_pixel_array(void) + {unsigned char *prP; + unsigned char *temp_prP; + unsigned char *new_prP; +@@ -1220,6 +1220,7 @@ + glyph). + + @= ++static + #ifdef __GNUC__ + __inline__ + #endif +@@ -1228,6 +1229,7 @@ + + @ + @c ++static + #ifdef __GNUC__ + __inline__ + #endif +@@ -1270,6 +1272,7 @@ + + @ + @= ++static + #ifdef __GNUC__ + __inline__ + #endif +@@ -1278,6 +1281,7 @@ + + @ + @c ++static + #ifdef __GNUC__ + __inline__ + #endif +@@ -1323,7 +1327,7 @@ + @d NOOP 244 /* not used */ + + @= +-void write_coding(void); ++static void write_coding(void); + + + @ +@@ -1331,7 +1335,7 @@ + ``Unreachable code $\ldots$'' or something similar. + + @c +-void write_coding(void) ++static void write_coding(void) + {register int count, skip; + register unsigned char paint; + register int x, y; +@@ -1484,12 +1488,12 @@ + single bytes and use the \.{HEADER} command repeatedly. + + @= +-void write_pl(void); ++static void write_pl(void); + + + @ + @c +-void write_pl(void) ++static void write_pl(void) + {int i, pos; + char output_file[FILE_NAME_LENGTH + 1]; + long t, sc; +@@ -1581,12 +1585,12 @@ + of the subfonts back to the original encoding positions. + + @= +-void write_ovp(void); ++static void write_ovp(void); + + + @ + @c +-void write_ovp(void) ++static void write_ovp(void) + {int c, i, nmb_subfonts, remainder, count, pos; + char output_file[FILE_NAME_LENGTH + 1]; + long t, sc; +@@ -1726,12 +1730,12 @@ + + @ + @= +-void write_job(void); ++static void write_job(void); + + + @ + @c +-void write_job(void) ++static void write_job(void) + {FILE *out; + int i, j; + char buffer[FILE_NAME_LENGTH + 1]; +@@ -1975,7 +1979,7 @@ + + @ + @= +-void read_config(void); ++static void read_config(void); + + + @ +@@ -1983,7 +1987,7 @@ + isn't a HBF font at all. + + @c +-void read_config(void) ++static void read_config(void) + {HBF_BBOX *boxp; + char *real_config_file; + +@@ -2306,12 +2310,12 @@ + |Buffer| if existent. |fsearch()| returns~1 on success. + + @= +-int fsearch(const char *); ++static int fsearch(const char *); + + + @ + @c +-int fsearch(const char *search_string) ++static int fsearch(const char *search_string) + {char *P, p; + const char *Q; + char temp_buffer[STRING_LENGTH + 1]; +@@ -2445,12 +2449,12 @@ + message. + + @= +-void config_error(const char *); ++static void config_error(const char *); + + + @ + @c +-void config_error(const char *message) ++static void config_error(const char *message) + {fprintf(stderr, "Couldn't find `%s' entry in configuration file\n", + message); + exit(1); +@@ -2488,12 +2492,12 @@ + + @ + @= +-const char *TeX_search_version(void); ++static const char *TeX_search_version(void); + + + @ + @c +-const char *TeX_search_version(void) ++static const char *TeX_search_version(void) + { + #if defined(HAVE_LIBKPATHSEA) + return kpathsea_version_string; +@@ -2525,8 +2529,8 @@ + @= + #ifdef HAVE_EMTEXDIR + extern int setup_list(struct emtex_dir *, char *, const char *, unsigned); +-int dir_setup(struct emtex_dir *, const char *, const char *, unsigned); +-char *file_find(char *, struct emtex_dir *); ++static int dir_setup(struct emtex_dir *, const char *, const char *, unsigned); ++static char *file_find(char *, struct emtex_dir *); + #endif + + +@@ -2536,7 +2540,7 @@ + + @c + #ifdef HAVE_EMTEXDIR +-int dir_setup(ed, env, dir, flags) ++static int dir_setup(ed, env, dir, flags) + struct emtex_dir *ed; + const char *env; + const char *dir; +@@ -2558,16 +2562,20 @@ + + return TRUE; + } ++#endif + + + @ + @= ++#ifdef HAVE_EMTEXDIR + char name_buffer[FILE_NAME_LENGTH + 1]; ++#endif + + + @ + @c +-char *file_find(name, list) ++#ifdef HAVE_EMTEXDIR ++static char *file_find(name, list) + char *name; + struct emtex_dir *list; + +@@ -2611,38 +2619,38 @@ + versions, and within \.{HBF2GFINPUTS} for new versions. + + @= +-char *TeX_search_cfg_file(char *); +-char *TeX_search_hbf_file(char *); ++static char *TeX_search_cfg_file(char *); ++static char *TeX_search_hbf_file(char *); + + + @ + @c + #if defined(HAVE_LIBKPATHSEA) +-char *TeX_search_cfg_file(char *name) ++static char *TeX_search_cfg_file(char *name) + { + return kpse_find_file(name, kpse_program_text_format, TRUE); + }@# + + +-char *TeX_search_hbf_file(char *name) ++static char *TeX_search_hbf_file(char *name) + { + return kpse_find_file(name, kpse_miscfonts_format, TRUE); + }@# + + + #elif defined(HAVE_EMTEXDIR) +-char *TeX_search_cfg_file(char *name) ++static char *TeX_search_cfg_file(char *name) + {return file_find(name, &cfg_path); + }@# + + +-char *TeX_search_hbf_file(char *name) ++static char *TeX_search_hbf_file(char *name) + {return file_find(name, &hbf_path); + }@# + + + #elif defined(HAVE_MIKTEX) +-char *TeX_search_cfg_file(char *name) ++static char *TeX_search_cfg_file(char *name) + {char result[_MAX_PATH]; + + if (!miktex_find_input_file("hbf2gf", *name, result)) +@@ -2651,7 +2659,7 @@ + }@# + + +-char *TeX_search_hbf_file(char *name) ++static char *TeX_search_hbf_file(char *name) + {char result[_MAX_PATH]; + + +@@ -2662,12 +2670,12 @@ + + + #else +-char *TeX_search_cfg_file(char *name) ++static char *TeX_search_cfg_file(char *name) + {return name; + }@# + + +-char *TeX_search_hbf_file(char *name) ++static char *TeX_search_hbf_file(char *name) + {return name; + } + #endif diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/hbf2gf.w b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/hbf2gf.w index c8155fa2ad0..ca4f3f0856d 100644 --- a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/hbf2gf.w +++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/hbf2gf.w @@ -427,7 +427,7 @@ consists of three sections: a preamble, a data section, and a postamble. The functions |write_pre()|, |write_data()|, and |write_post()| handle this. @= -void write_file(void); +static void write_file(void); @ @@ -435,7 +435,7 @@ In \mf-like mode we create font file name extensions similar to \mf\ if the \.{-n} option isn't specified; otherwise only `\.{.gf}' will be appended. @c -void write_file(void) +static void write_file(void) {char output_file[FILE_NAME_LENGTH + 1]; @@ -489,14 +489,14 @@ no terminating NULL byte. @d header " hbf2gf output " @= -void write_pre(void); +static void write_pre(void); @ @s tm int @c -void write_pre(void) +static void write_pre(void) {char out_s[40], s[20]; time_t secs_now; struct tm *time_now; @@ -577,12 +577,12 @@ int dot_count; /* this counts the processed characters; @ @= -void write_data(void); +static void write_data(void); @ @c -void write_data(void) +static void write_data(void) {dot_count = 0; char_adr_p = char_adr;@# @@ -688,12 +688,12 @@ and configuration file also. \TeX\ defines that 72.27~points are exactly 1~inch. @= -void write_post(void); +static void write_post(void); @ @c -void write_post(void) +static void write_post(void) {long special_adr; long post_adr;@# @@ -832,12 +832,12 @@ addresses describe the whole file. \TeX\ wants the most significant byte first. @= -void fputl(long, FILE *); +static void fputl(long, FILE *); @ @c -void fputl(long num, FILE *f) +static void fputl(long num, FILE *f) {fputc(num >> 24, f); fputc(num >> 16, f); fputc(num >> 8, f); @@ -992,12 +992,12 @@ result into an output array. @= -void make_pixel_array(void); +static void make_pixel_array(void); @ @c -void make_pixel_array(void) +static void make_pixel_array(void) {unsigned char *prP; unsigned char *temp_prP; unsigned char *new_prP; @@ -1220,6 +1220,7 @@ that in this case |input_size_x| already reflects the width of the rotated glyph). @= +static #ifdef __GNUC__ __inline__ #endif @@ -1228,6 +1229,7 @@ void read_row(unsigned char *); @ @c +static #ifdef __GNUC__ __inline__ #endif @@ -1270,6 +1272,7 @@ int threshold = 128; @ @= +static #ifdef __GNUC__ __inline__ #endif @@ -1278,6 +1281,7 @@ void write_row(unsigned char *); @ @c +static #ifdef __GNUC__ __inline__ #endif @@ -1323,7 +1327,7 @@ For further details please refer to ``\mf---the program''. @d NOOP 244 /* not used */ @= -void write_coding(void); +static void write_coding(void); @ @@ -1331,7 +1335,7 @@ The |goto start| instruction causes some compilers to complain about ``Unreachable code $\ldots$'' or something similar. @c -void write_coding(void) +static void write_coding(void) {register int count, skip; register unsigned char paint; register int x, y; @@ -1484,12 +1488,12 @@ To have an identification string in the \.{TFM} file, we split it into single bytes and use the \.{HEADER} command repeatedly. @= -void write_pl(void); +static void write_pl(void); @ @c -void write_pl(void) +static void write_pl(void) {int i, pos; char output_file[FILE_NAME_LENGTH + 1]; long t, sc; @@ -1581,12 +1585,12 @@ The following is very similar to |write_pl()|; we simply map the glyphs of the subfonts back to the original encoding positions. @= -void write_ovp(void); +static void write_ovp(void); @ @c -void write_ovp(void) +static void write_ovp(void) {int c, i, nmb_subfonts, remainder, count, pos; char output_file[FILE_NAME_LENGTH + 1]; long t, sc; @@ -1726,12 +1730,12 @@ int ofm_file = FALSE; @ @= -void write_job(void); +static void write_job(void); @ @c -void write_job(void) +static void write_job(void) {FILE *out; int i, j; char buffer[FILE_NAME_LENGTH + 1]; @@ -1975,7 +1979,7 @@ char Buffer[STRING_LENGTH + 1]; @ @= -void read_config(void); +static void read_config(void); @ @@ -1983,7 +1987,7 @@ If |config_file| isn't found in \mf-like mode we assume that the font isn't a HBF font at all. @c -void read_config(void) +static void read_config(void) {HBF_BBOX *boxp; char *real_config_file; @@ -2306,12 +2310,12 @@ character (|'\n'|). It also checks the presence of a parameter and fills |Buffer| if existent. |fsearch()| returns~1 on success. @= -int fsearch(const char *); +static int fsearch(const char *); @ @c -int fsearch(const char *search_string) +static int fsearch(const char *search_string) {char *P, p; const char *Q; char temp_buffer[STRING_LENGTH + 1]; @@ -2445,12 +2449,12 @@ If an error occurs, |config_error()| will leave the program with an error message. @= -void config_error(const char *); +static void config_error(const char *); @ @c -void config_error(const char *message) +static void config_error(const char *message) {fprintf(stderr, "Couldn't find `%s' entry in configuration file\n", message); exit(1); @@ -2488,12 +2492,12 @@ char no_version_string[] = "no search library"; @ @= -const char *TeX_search_version(void); +static const char *TeX_search_version(void); @ @c -const char *TeX_search_version(void) +static const char *TeX_search_version(void) { #if defined(HAVE_LIBKPATHSEA) return kpathsea_version_string; @@ -2525,8 +2529,8 @@ struct emtex_dir cfg_path, hbf_path; @= #ifdef HAVE_EMTEXDIR extern int setup_list(struct emtex_dir *, char *, const char *, unsigned); -int dir_setup(struct emtex_dir *, const char *, const char *, unsigned); -char *file_find(char *, struct emtex_dir *); +static int dir_setup(struct emtex_dir *, const char *, const char *, unsigned); +static char *file_find(char *, struct emtex_dir *); #endif @@ -2536,7 +2540,7 @@ output a warning in case the environment variable |env| isn't set properly. @c #ifdef HAVE_EMTEXDIR -int dir_setup(ed, env, dir, flags) +static int dir_setup(ed, env, dir, flags) struct emtex_dir *ed; const char *env; const char *dir; @@ -2558,16 +2562,20 @@ int dir_setup(ed, env, dir, flags) return TRUE; } +#endif @ @= +#ifdef HAVE_EMTEXDIR char name_buffer[FILE_NAME_LENGTH + 1]; +#endif @ @c -char *file_find(name, list) +#ifdef HAVE_EMTEXDIR +static char *file_find(name, list) char *name; struct emtex_dir *list; @@ -2611,38 +2619,38 @@ are searched in the path specified within \.{TEXCONFIG} for old kpathsea versions, and within \.{HBF2GFINPUTS} for new versions. @= -char *TeX_search_cfg_file(char *); -char *TeX_search_hbf_file(char *); +static char *TeX_search_cfg_file(char *); +static char *TeX_search_hbf_file(char *); @ @c #if defined(HAVE_LIBKPATHSEA) -char *TeX_search_cfg_file(char *name) +static char *TeX_search_cfg_file(char *name) { return kpse_find_file(name, kpse_program_text_format, TRUE); }@# -char *TeX_search_hbf_file(char *name) +static char *TeX_search_hbf_file(char *name) { return kpse_find_file(name, kpse_miscfonts_format, TRUE); }@# #elif defined(HAVE_EMTEXDIR) -char *TeX_search_cfg_file(char *name) +static char *TeX_search_cfg_file(char *name) {return file_find(name, &cfg_path); }@# -char *TeX_search_hbf_file(char *name) +static char *TeX_search_hbf_file(char *name) {return file_find(name, &hbf_path); }@# #elif defined(HAVE_MIKTEX) -char *TeX_search_cfg_file(char *name) +static char *TeX_search_cfg_file(char *name) {char result[_MAX_PATH]; if (!miktex_find_input_file("hbf2gf", *name, result)) @@ -2651,7 +2659,7 @@ char *TeX_search_cfg_file(char *name) }@# -char *TeX_search_hbf_file(char *name) +static char *TeX_search_hbf_file(char *name) {char result[_MAX_PATH]; @@ -2662,12 +2670,12 @@ char *TeX_search_hbf_file(char *name) #else -char *TeX_search_cfg_file(char *name) +static char *TeX_search_cfg_file(char *name) {return name; }@# -char *TeX_search_hbf_file(char *name) +static char *TeX_search_hbf_file(char *name) {return name; } #endif diff --git a/Build/source/texk/cjkutils/hbf2gf.c b/Build/source/texk/cjkutils/hbf2gf.c index 02973893f5e..7a39b24b2ec 100644 --- a/Build/source/texk/cjkutils/hbf2gf.c +++ b/Build/source/texk/cjkutils/hbf2gf.c @@ -121,7 +121,7 @@ /*:10*//*69:*/ -#line 2469 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" +#line 2473 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" #if defined(HAVE_LIBKPATHSEA) #include "kpathsea/kpathsea.h" @@ -139,42 +139,43 @@ /*11:*/ #line 429 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" -void write_file(void); +static void write_file(void); /*:11*//*13:*/ #line 491 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" -void write_pre(void); +static void write_pre(void); /*:13*//*16:*/ #line 579 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" -void write_data(void); +static void write_data(void); /*:16*//*20:*/ #line 690 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" -void write_post(void); +static void write_post(void); /*:20*//*25:*/ #line 834 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" -void fputl(long,FILE*); +static void fputl(long,FILE*); /*:25*//*29:*/ #line 994 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" -void make_pixel_array(void); +static void make_pixel_array(void); /*:29*//*36:*/ #line 1222 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" +static #ifdef __GNUC__ __inline__ #endif @@ -182,8 +183,9 @@ void read_row(unsigned char*); /*:36*//*39:*/ -#line 1272 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" +#line 1274 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" +static #ifdef __GNUC__ __inline__ #endif @@ -191,68 +193,68 @@ void write_row(unsigned char*); /*:39*//*41:*/ -#line 1325 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" +#line 1329 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" -void write_coding(void); +static void write_coding(void); /*:41*//*45:*/ -#line 1486 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" +#line 1490 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" -void write_pl(void); +static void write_pl(void); /*:45*//*47:*/ -#line 1583 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" +#line 1587 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" -void write_ovp(void); +static void write_ovp(void); /*:47*//*50:*/ -#line 1728 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" +#line 1732 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" -void write_job(void); +static void write_job(void); /*:50*//*54:*/ -#line 1977 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" +#line 1981 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" -void read_config(void); +static void read_config(void); /*:54*//*64:*/ -#line 2308 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" +#line 2312 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" -int fsearch(const char*); +static int fsearch(const char*); /*:64*//*67:*/ -#line 2447 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" +#line 2451 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" -void config_error(const char*); +static void config_error(const char*); /*:67*//*71:*/ -#line 2490 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" +#line 2494 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" -const char*TeX_search_version(void); +static const char*TeX_search_version(void); /*:71*//*74:*/ -#line 2525 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" +#line 2529 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" #ifdef HAVE_EMTEXDIR extern int setup_list(struct emtex_dir*,char*,const char*,unsigned); -int dir_setup(struct emtex_dir*,const char*,const char*,unsigned); -char*file_find(char*,struct emtex_dir*); +static int dir_setup(struct emtex_dir*,const char*,const char*,unsigned); +static char*file_find(char*,struct emtex_dir*); #endif /*:74*//*79:*/ -#line 2613 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" +#line 2621 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" -char*TeX_search_cfg_file(char*); -char*TeX_search_hbf_file(char*); +static char*TeX_search_cfg_file(char*); +static char*TeX_search_hbf_file(char*); /*:79*/ @@ -384,13 +386,13 @@ long s_mag_x,s_mag_y,s_slant; /*:27*//*38:*/ -#line 1267 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" +#line 1269 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" int threshold= 128; /*:38*//*49:*/ -#line 1717 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" +#line 1721 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" char job_extension[EXTENSION_LENGTH+1]; char rm_command[STRING_LENGTH+1]; @@ -402,13 +404,13 @@ int ofm_file= FALSE; /*:49*//*53:*/ -#line 1972 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" +#line 1976 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" char Buffer[STRING_LENGTH+1]; /*:53*//*58:*/ -#line 2090 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" +#line 2094 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" int offset_x; int offset_y; @@ -417,13 +419,13 @@ HBF_CHAR user_min_char; int have_min_char= FALSE; /*:58*//*60:*/ -#line 2247 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" +#line 2251 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" HBF_CHAR min_char,max_char; /*:60*//*62:*/ -#line 2274 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" +#line 2278 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" char b2_codes[256]; unsigned char min_2_byte,max_2_byte; @@ -431,7 +433,7 @@ int nmb_2_bytes= 0; /*:62*//*70:*/ -#line 2481 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" +#line 2485 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" #if defined(HAVE_EMTEXDIR) char emtex_version_string[]= "emTeXdir"; @@ -441,7 +443,7 @@ char no_version_string[]= "no search library"; /*:70*//*73:*/ -#line 2518 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" +#line 2522 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" #ifdef HAVE_EMTEXDIR struct emtex_dir cfg_path,hbf_path; @@ -449,9 +451,11 @@ struct emtex_dir cfg_path,hbf_path; /*:73*//*76:*/ -#line 2564 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" +#line 2569 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" +#ifdef HAVE_EMTEXDIR char name_buffer[FILE_NAME_LENGTH+1]; +#endif /*:76*/ @@ -463,7 +467,7 @@ int main(int argc,char*argv[]) {char*p; /*78:*/ -#line 2586 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" +#line 2594 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" #if defined(HAVE_LIBKPATHSEA) kpse_set_program_name(argv[0],"hbf2gf"); @@ -744,7 +748,7 @@ return 0; /*:4*//*12:*/ #line 437 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" -void write_file(void) +static void write_file(void) {char output_file[FILE_NAME_LENGTH+1]; @@ -788,7 +792,7 @@ write_data(); /*:12*//*14:*/ #line 498 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" -void write_pre(void) +static void write_pre(void) {char out_s[40],s[20]; time_t secs_now; struct tm*time_now; @@ -811,7 +815,7 @@ fputs(out_s,out); /*:14*//*17:*/ #line 584 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" -void write_data(void) +static void write_data(void) {dot_count= 0; char_adr_p= char_adr; @@ -869,7 +873,7 @@ fputc(EOC,out); /*:17*//*21:*/ #line 695 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" -void write_post(void) +static void write_post(void) {long special_adr; long post_adr; @@ -978,7 +982,7 @@ fputc(POSTPOST_ID,out); /*:21*//*26:*/ #line 839 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" -void fputl(long num,FILE*f) +static void fputl(long num,FILE*f) {fputc(num>>24,f); fputc(num>>16,f); fputc(num>>8,f); @@ -989,7 +993,7 @@ fputc(num,f); /*:26*//*30:*/ #line 999 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" -void make_pixel_array(void) +static void make_pixel_array(void) {unsigned char*prP; unsigned char*temp_prP; unsigned char*new_prP; @@ -1208,8 +1212,9 @@ goto again; /*:30*//*37:*/ -#line 1230 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" +#line 1231 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" +static #ifdef __GNUC__ __inline__ #endif @@ -1243,8 +1248,9 @@ bitshift= 7; /*:37*//*40:*/ -#line 1280 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" +#line 1283 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w" +static #ifdef __GNUC__ __inline__ #endif @@ -1259,9 +1265,9 @@ for(col= 0,xP= pixelrow;col