diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2011-03-07 10:49:53 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2011-03-07 10:49:53 +0000 |
commit | fa94e399e78544fb77abd60e1b0090b6248d6d1d (patch) | |
tree | 5d8bf807fbb359b43ef2a0144a4193a3f0778b5b /Build/source/texk/kpathsea | |
parent | ca7b5c3464b1daa17a18ba5a512b36a11fd0561e (diff) |
Rename program_invocation_*name => kpse_invocation_*name
(1) to avoid conflict with /usr/include/sys/error.h from Cygwin, and
(2) to indicate that these are not the variables from glibc.
git-svn-id: svn://tug.org/texlive/trunk@21624 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/kpathsea')
-rw-r--r-- | Build/source/texk/kpathsea/ChangeLog | 12 | ||||
-rw-r--r-- | Build/source/texk/kpathsea/config.h | 2 | ||||
-rw-r--r-- | Build/source/texk/kpathsea/progname.h | 2 | ||||
-rw-r--r-- | Build/source/texk/kpathsea/types.h | 8 |
4 files changed, 17 insertions, 7 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog index 7eb1b1894f6..a9dac927efc 100644 --- a/Build/source/texk/kpathsea/ChangeLog +++ b/Build/source/texk/kpathsea/ChangeLog @@ -1,3 +1,13 @@ +2011-03-07 Peter Breitenlohner <peb@mppmu.mpg.de> + + * types.h: Rename the variables program_invocation_name and + program_invocation_short_name into kpse_invocation_name and + kpse_invocation_short_name repectively, (1) in order to avoid + conflicts with /usr/include/sys/errno.h from Cygwin, and (2) + because they are not the same as those from the GNU C library. + + Problem reported by Ken Brown <kbrow1i@gmail.com>. + 2011-03-03 Peter Breitenlohner <peb@mppmu.mpg.de> * lib.h, xftell.c (xftell): Change return type from unsigned to @@ -6,7 +16,7 @@ 2011-03-01 Karl Berry <karl@tug.org> * texmf.cnf: be more explicit that all trees, including TEXMFHOME, - must follow the TDS> + must follow the TDS. 2011-03-01 Peter Breitenlohner <peb@mppmu.mpg.de> diff --git a/Build/source/texk/kpathsea/config.h b/Build/source/texk/kpathsea/config.h index fdd7f81bf93..515bd97f644 100644 --- a/Build/source/texk/kpathsea/config.h +++ b/Build/source/texk/kpathsea/config.h @@ -105,7 +105,7 @@ #include <kpathsea/debug.h> /* Runtime tracing. */ #include <kpathsea/lib.h> /* STREQ, etc. */ #include <kpathsea/types.h> /* <sys/types.h>, boolean, string, etc. */ -#include <kpathsea/progname.h> /* for program_invocation_*name */ +#include <kpathsea/progname.h> /* for kpse_invocation_*name */ /* If you want to find subdirectories in a directory with non-Unix diff --git a/Build/source/texk/kpathsea/progname.h b/Build/source/texk/kpathsea/progname.h index 9692b22ed4f..7b81fbd35d3 100644 --- a/Build/source/texk/kpathsea/progname.h +++ b/Build/source/texk/kpathsea/progname.h @@ -30,7 +30,7 @@ extern KPSEDLL string kpathsea_selfdir (kpathsea kpse, const_string argv0); /* Set the first two variables above (if they're not predefined) to a copy of ARGV0 and everything in ARGV0 after the last directory separator, respectively. Set kpse_program_name to a copy of PROGNAME or the - value of program_invocation_short_name if PROGNAME is NULL. + value of kpse_invocation_short_name if PROGNAME is NULL. This function also determines the AUTO* variables. */ extern KPSEDLL void kpathsea_set_program_name (kpathsea kpse, diff --git a/Build/source/texk/kpathsea/types.h b/Build/source/texk/kpathsea/types.h index e16e428145e..f6ac30b1444 100644 --- a/Build/source/texk/kpathsea/types.h +++ b/Build/source/texk/kpathsea/types.h @@ -278,10 +278,10 @@ extern KPSEDLL kpathsea kpse_def; #define kpse_format_info kpse_def_inst.format_info #define kpse_debug_hash_lookup_int kpse_def_inst.debug_hash_lookup_int -#undef program_invocation_name -#define program_invocation_name kpse_def_inst.invocation_name -#undef program_invocation_short_name -#define program_invocation_short_name kpse_def_inst.invocation_short_name +#undef kpse_invocation_name +#define kpse_invocation_name kpse_def_inst.invocation_name +#undef kpse_invocation_short_name +#define kpse_invocation_short_name kpse_def_inst.invocation_short_name #endif /* KPSE_COMPAT_API */ |