diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2011-08-02 10:26:16 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2011-08-02 10:26:16 +0000 |
| commit | 9a634e078306d7a674684828beaabdc6f14c37cc (patch) | |
| tree | 172b53bc09053fd914090aab6c0e272b3c0bd791 /Build/source/utils | |
| parent | 875be8166b919a05395f1754da3678a18758fab8 (diff) | |
kpathsea: More changes to reduce diffs with W32TeX
git-svn-id: svn://tug.org/texlive/trunk@23314 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils')
| -rw-r--r-- | Build/source/utils/chktex/ChangeLog | 4 | ||||
| -rw-r--r-- | Build/source/utils/chktex/getopt.h | 11 |
2 files changed, 13 insertions, 2 deletions
diff --git a/Build/source/utils/chktex/ChangeLog b/Build/source/utils/chktex/ChangeLog index e3490c574b1..2cf30625957 100644 --- a/Build/source/utils/chktex/ChangeLog +++ b/Build/source/utils/chktex/ChangeLog @@ -1,3 +1,7 @@ +2011-08-02 Peter Breitenlohner <peb@mppmu.mpg.de> + + * getopt.h: Sync with ../../texk/kpathsea/getopt.h. + 2011-04-19 Peter Breitenlohner <peb@mppmu.mpg.de> * getopt.c: #include <string.h> for prototypes. diff --git a/Build/source/utils/chktex/getopt.h b/Build/source/utils/chktex/getopt.h index 68d10c0d5ea..af446433688 100644 --- a/Build/source/utils/chktex/getopt.h +++ b/Build/source/utils/chktex/getopt.h @@ -1,6 +1,6 @@ /* Declarations for getopt. - Copyright 2008, 2010 Karl Berry. + Copyright 2008, 2010, 2011 Karl Berry. Copyright 1989,90,91,92,93,94,96,97,2000,05 Free Software Foundation, Inc. The original version of this file was part of the GNU C Library. @@ -28,6 +28,7 @@ #define KPSE_DLL 1 #endif /* WIN32 && !__MINGW32__ && !NO_KPSE_DLL */ +#if !defined (KPSEDLL) #if defined (KPSE_DLL) && (defined (WIN32) || defined (__CYGWIN__)) #ifdef MAKE_KPSE_DLL #define KPSEDLL __declspec(dllexport) @@ -36,7 +37,8 @@ #endif #else /* ! (KPSE_DLL && (WIN32 || __CYGWIN__)) */ #define KPSEDLL -#endif +#endif /* ! (KPSE_DLL && (WIN32 || __CYGWIN__)) */ +#endif /* ! KPSEDLL */ #ifdef __cplusplus extern "C" { @@ -116,6 +118,10 @@ struct option differences in the consts, in stdlib.h. To avoid compilation errors, only prototype getopt for the GNU C library. */ extern KPSEDLL int getopt (int argc, char *const *argv, const char *shortopts); +#else /* not __GNU_LIBRARY__ */ +#ifndef __cplusplus +extern KPSEDLL int getopt (); +#endif /* not __cplusplus */ #endif /* __GNU_LIBRARY__ */ extern KPSEDLL int getopt_long (int argc, char *const *argv, const char *shortopts, const struct option *longopts, int *longind); @@ -133,6 +139,7 @@ extern int _getopt_internal (int argc, char *const *argv, #endif /* MAKE_KPSE_DLL || NO_KPSE_DLL */ #else /* not __STDC__ */ +extern KPSEDLL int getopt (); extern KPSEDLL int getopt_long (); extern KPSEDLL int getopt_long_only (); |