diff options
| author | Karl Berry <karl@freefriends.org> | 2008-01-18 19:23:27 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2008-01-18 19:23:27 +0000 |
| commit | 779252f1af86cb99955406cb9791a647539852ee (patch) | |
| tree | 7474753e780568f25083ff0bb759ff00770a2d3e | |
| parent | 86ef1002b41b8dca25b393c06f3064cbb9ba729c (diff) | |
avoid some type warnings
git-svn-id: svn://tug.org/texlive/trunk@6305 c570f23f-e606-0410-a88d-b1316a301751
| -rw-r--r-- | Build/source/texk/web2c/ChangeLog | 7 | ||||
| -rw-r--r-- | Build/source/texk/web2c/cpascal.h | 4 | ||||
| -rw-r--r-- | Build/source/texk/web2c/lib/texmfmp.c | 6 |
3 files changed, 13 insertions, 4 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index 355326c1ed9..c048c8b915f 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,10 @@ +2008-01-18 Karl Berry <karl@tug.org> + + * cpascal.h (recorder_record_input, recorder_record_output): need + const_string as arg to avoid warnings compiling *extra.c. + * texmfmp.c (user_progname): make const_string a la dump_name, + since we assign them. + 2008-01-02 Jonathan Kew <jonathan_kew@sil.org> * tex.ch (expand_depth, et al.): when calling expand, don't diff --git a/Build/source/texk/web2c/cpascal.h b/Build/source/texk/web2c/cpascal.h index ea71e72a298..f930bcd6b5b 100644 --- a/Build/source/texk/web2c/cpascal.h +++ b/Build/source/texk/web2c/cpascal.h @@ -273,8 +273,8 @@ extern void close_file P1H(FILE *); extern void recorder_change_filename P1H(string); extern boolean recorder_enabled; extern string output_directory; -extern void recorder_record_input P1H(string); -extern void recorder_record_output P1H(string); +extern void recorder_record_input P1H(const_string); +extern void recorder_record_output P1H(const_string); /* version.c */ extern string versionstring; diff --git a/Build/source/texk/web2c/lib/texmfmp.c b/Build/source/texk/web2c/lib/texmfmp.c index bc44225ca99..28f6c8acd79 100644 --- a/Build/source/texk/web2c/lib/texmfmp.c +++ b/Build/source/texk/web2c/lib/texmfmp.c @@ -115,7 +115,7 @@ char **argv; int argc; /* If the user overrides argv[0] with -progname. */ -static string user_progname; +static const_string user_progname; /* The C version of what might wind up in DUMP_VAR. */ static const_string dump_name; @@ -187,6 +187,7 @@ maininit P2C(int, ac, string *, av) /* Must be initialized before options are parsed. */ interactionoption = 4; + /* Have things to record as we go along. */ kpse_record_input = recorder_record_input; kpse_record_output = recorder_record_output; @@ -200,7 +201,8 @@ maininit P2C(int, ac, string *, av) parse_options (ac, av); /* If -progname was not specified, default to the dump name. */ - if (!user_progname) user_progname = dump_name; + if (!user_progname) + user_progname = dump_name; /* Do this early so we can inspect program_invocation_name and kpse_program_name below, and because we have to do this before |