diff options
| author | Karl Berry <karl@freefriends.org> | 2010-02-15 01:43:12 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2010-02-15 01:43:12 +0000 |
| commit | cf27a3ce2d285007644e7577bb29ff7c28eed60f (patch) | |
| tree | bc882df3239f39fbe3a5bb7adcf1fd2486b18a41 /Build | |
| parent | b77b8199329b20ca0d1db70060cef4e81704e74d (diff) | |
use __DJGPP__ instead of DJGPP (from Javier Mugica)
git-svn-id: svn://tug.org/texlive/trunk@17027 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
| -rw-r--r-- | Build/source/texk/kpathsea/ChangeLog | 10 | ||||
| -rw-r--r-- | Build/source/texk/kpathsea/progname.c | 8 | ||||
| -rw-r--r-- | Build/source/texk/kpathsea/tex-make.c | 4 |
3 files changed, 14 insertions, 8 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog index 9e56ac31d83..21021e75d96 100644 --- a/Build/source/texk/kpathsea/ChangeLog +++ b/Build/source/texk/kpathsea/ChangeLog @@ -1,3 +1,13 @@ +2010-02-15 Karl Berry <karl@tug.org> + + * tex-make.c [DJGPP]: change conditionals to __DJGPP__ for + consistency. + + * progname.c (<kpathsea/mingw32.h>) [__MINGW32__]: remove + #include, it's redundant with kpathsea/config.h. + (<kpathsea/c-pathmx.h>) [__DJGPP__]: change conditional from DJGPP. + Suggestion from Javier Mugica, 13 Feb 2010 20:46:12. + 2010-02-12 Peter Breitenlohner <peb@mppmu.mpg.de> * dir.c (kpathsea_dir_p), elt-dirs.c (kpathsea_normalize_path), diff --git a/Build/source/texk/kpathsea/progname.c b/Build/source/texk/kpathsea/progname.c index 8918e0dac9c..809b86e7704 100644 --- a/Build/source/texk/kpathsea/progname.c +++ b/Build/source/texk/kpathsea/progname.c @@ -1,6 +1,6 @@ /* progname.c: the executable name we were invoked as; general initialization. - Copyright 1994, 1996, 1997, 2008, 2009 Karl Berry. + Copyright 1994, 1996, 1997, 2008, 2009, 2010 Karl Berry. Copyright 1998-2005 Olaf Weber. This library is free software; you can redistribute it and/or @@ -24,14 +24,10 @@ /* For kpse_reset_progname */ #include <kpathsea/tex-file.h> -#if defined (WIN32) || defined (DJGPP) +#if defined (WIN32) || defined (__DJGPP__) #include <kpathsea/c-pathmx.h> #endif -#ifdef __MINGW32__ -#include <kpathsea/mingw32.h> -#endif - #if defined(__i386_pc_gnu__) #ifndef _S_ISUID #define _S_ISUID 04000 /* Set user ID on execution. */ diff --git a/Build/source/texk/kpathsea/tex-make.c b/Build/source/texk/kpathsea/tex-make.c index c7b7df6f4e6..f65be651cf2 100644 --- a/Build/source/texk/kpathsea/tex-make.c +++ b/Build/source/texk/kpathsea/tex-make.c @@ -27,7 +27,7 @@ #include <kpathsea/tex-make.h> #include <kpathsea/variable.h> -#if !defined (AMIGA) && !(defined (MSDOS) && !defined(DJGPP)) && !defined (WIN32) +#if !defined (AMIGA) && !(defined (MSDOS) && !defined(__DJGPP__)) && !defined (WIN32) #include <sys/wait.h> #endif @@ -174,7 +174,7 @@ maketex (kpathsea kpse, kpse_file_format_type format, string* args) ret = system(cmd) == 0 ? getenv ("LAST_FONT_CREATED"): NULL; free (cmd); } -#elif defined (MSDOS) && !defined(DJGPP) +#elif defined (MSDOS) && !defined(__DJGPP__) #error Implement new MSDOS mktex call interface here #elif defined (WIN32) |