summaryrefslogtreecommitdiff
path: root/Build/source/texk/kpathsea/getopt.h
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-01-31 00:37:08 +0000
committerKarl Berry <karl@freefriends.org>2010-01-31 00:37:08 +0000
commitfddb3638f20eff3f5c3a2f87103b8c1f330a637d (patch)
tree26e8107bf7dc9849f4727c8e5e2758106afe216d /Build/source/texk/kpathsea/getopt.h
parentb251a1a9ddd70c3703f12bb312787f0406f368cd (diff)
reinstate win32lib.h and make other _WIN32-related changes, for compilation with MSVC 7.1; from Javier Mugica
git-svn-id: svn://tug.org/texlive/trunk@16876 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/kpathsea/getopt.h')
-rw-r--r--Build/source/texk/kpathsea/getopt.h12
1 files changed, 5 insertions, 7 deletions
diff --git a/Build/source/texk/kpathsea/getopt.h b/Build/source/texk/kpathsea/getopt.h
index c0098f19ba6..f91650263c8 100644
--- a/Build/source/texk/kpathsea/getopt.h
+++ b/Build/source/texk/kpathsea/getopt.h
@@ -24,9 +24,11 @@
#ifndef _GETOPT_H
#define _GETOPT_H 1
-#if defined(WIN32)
-#ifndef __STDC__
-#define __STDC__ 1
+#if !defined (__STDC__) || !__STDC__
+/* This is a separate conditional since some stdc systems
+ reject `defined (const)'. */
+#ifndef const
+#define const
#endif
#endif
@@ -98,11 +100,7 @@ extern KPSEDLL int optopt;
struct option
{
-#if defined (__STDC__) && __STDC__
const char *name;
-#else
- char *name;
-#endif
/* has_arg can't be an enum because some compilers complain about
type mismatches in all the code that assumes it is an int. */
int has_arg;