diff options
author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2015-12-29 09:03:01 +0000 |
---|---|---|
committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2015-12-29 09:03:01 +0000 |
commit | 94b2599d4a7aece204089a48207bee187c455ec4 (patch) | |
tree | e0a1df56e0b4290213cbe367a5c09e8eaef64a46 /Build | |
parent | eab42d1eec7c5a1a356ca867b1f629d7fe97c543 (diff) |
texk/kpathsea: Update win32lib.h (win32 only)
git-svn-id: svn://tug.org/texlive/trunk@39230 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r-- | Build/source/texk/kpathsea/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/texk/kpathsea/win32lib.h | 22 |
2 files changed, 18 insertions, 8 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog index 75e520c6d68..f43e07ec920 100644 --- a/Build/source/texk/kpathsea/ChangeLog +++ b/Build/source/texk/kpathsea/ChangeLog @@ -1,3 +1,7 @@ +2015-12-29 Akira Kakuto <kakuto@fuk.kindai.ac.jp> + + * win32lib.h: Update (w32 only). + 2015-00-01 Peter Breitenlohner <peb@mppmu.mpg.de> * kpsewhich.c (USGAE): Say "list shown by -help-formats". diff --git a/Build/source/texk/kpathsea/win32lib.h b/Build/source/texk/kpathsea/win32lib.h index 853899ddb7b..b31ab623567 100644 --- a/Build/source/texk/kpathsea/win32lib.h +++ b/Build/source/texk/kpathsea/win32lib.h @@ -1,6 +1,6 @@ /* win32lib.h: bits and pieces for win32 and msvc. - Copyright 2006, 2010-2013 Akira Kakuto. + Copyright 2006, 2010-2015 Akira Kakuto. Copyright 1996, 1997, 1998, 1999 Fabrice Popineau. This library is free software; you can redistribute it and/or @@ -55,6 +55,7 @@ /* These have to be defined because our compilers treat __STDC__ as being defined (most of them anyway). */ +#if !defined(__cplusplus) #define access _access #define alloca _alloca #define chdir _chdir @@ -74,7 +75,6 @@ #define ftime _ftime #define getpid _getpid #define getcwd _getcwd -#define getwd(dir) GetCurrentDirectory(MAXPATHLEN, dir) #define inline __inline #define isascii __isascii #define isatty _isatty @@ -84,7 +84,6 @@ #define memicmp _memicmp #define mktemp _mktemp #define open _open - #define putenv _putenv #define read _read #define rmdir _rmdir @@ -92,13 +91,8 @@ #define spawnlp _spawnlp #define stat _stat #define stricmp _stricmp -#ifdef strcasecmp -#undef strcasecmp -#endif -#define strcasecmp _stricmp #define strdup _strdup #define strlwr _strlwr -#define strncasecmp _strnicmp #define strnicmp _strnicmp #define tempnam _tempnam #define timeb _timeb @@ -107,6 +101,18 @@ #define umask _umask #define utime _utime #define write _write +#endif /* !__cplusplus */ + +#define getwd(dir) GetCurrentDirectory(MAXPATHLEN, dir) + +#ifdef strcasecmp +#undef strcasecmp +#endif +#ifdef strncasecmp +#undef strncasecmp +#endif +#define strcasecmp _stricmp +#define strncasecmp _strnicmp #ifndef S_IFMT #define S_IFMT _S_IFMT |