6 files changed, 15 insertions, 43 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 5f1da84a217..2ad48d50603 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,11 @@
+2010-02-01  Karl Berry  <karl@tug.org>
+
+	* strstr.c,
+	* strcasecmp.c,
+	* getopt.c,
+	* getopt.h, 
+	* getopt1.c: remove all redefinitions of const.
+
 2010-01-31  Javier Mugica  <javier@digi21.eu>
 
 	Support compilation with MSVC 7.1:
diff --git a/Build/source/texk/kpathsea/getopt.c b/Build/source/texk/kpathsea/getopt.c
index 058ca27cd70..5080a35b233 100644
--- a/Build/source/texk/kpathsea/getopt.c
+++ b/Build/source/texk/kpathsea/getopt.c
@@ -1,7 +1,7 @@
 /* Getopt for GNU.
 
-   Copyright 2008, 2009 Karl Berry.
-   Copyright (C) 1987, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 2000
+   Copyright 2008, 2009, 2010 Karl Berry.
+   Copyright (C) 1987, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 2000, 2010
    	Free Software Foundation, Inc.
 
    The original version of this file was part of the GNU C Library.
@@ -33,14 +33,6 @@
 #include <config.h>
 #endif
 
-#if !defined (__STDC__) || !__STDC__
-/* This is a separate conditional since some stdc systems
-   reject `defined (const)'.  */
-#ifndef const
-#define const
-#endif
-#endif
-
 #include <stdio.h>
 
 /* Comment out all this code if we are using the GNU C Library, and are not
diff --git a/Build/source/texk/kpathsea/getopt.h b/Build/source/texk/kpathsea/getopt.h
index f91650263c8..932cf5d941a 100644
--- a/Build/source/texk/kpathsea/getopt.h
+++ b/Build/source/texk/kpathsea/getopt.h
@@ -1,6 +1,6 @@
 /* Declarations for getopt.
 
-   Copyright 2008 Karl Berry.
+   Copyright 2008, 2010 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.
@@ -24,14 +24,6 @@
 #ifndef _GETOPT_H
 #define _GETOPT_H 1
 
-#if !defined (__STDC__) || !__STDC__
-/* This is a separate conditional since some stdc systems
-   reject `defined (const)'.  */
-#ifndef const
-#define const
-#endif
-#endif
-
 #if defined (KPSE_DLL) && (defined (WIN32) || defined (__CYGWIN__))
 #ifdef MAKE_KPSE_DLL
 #define KPSEDLL __declspec(dllexport)
diff --git a/Build/source/texk/kpathsea/getopt1.c b/Build/source/texk/kpathsea/getopt1.c
index 1bbe8877d03..f5db79b19c3 100644
--- a/Build/source/texk/kpathsea/getopt1.c
+++ b/Build/source/texk/kpathsea/getopt1.c
@@ -26,14 +26,6 @@
 
 #include "getopt.h"
 
-#if !defined (__STDC__) || !__STDC__
-/* This is a separate conditional since some stdc systems
-   reject `defined (const)'.  */
-#ifndef const
-#define const
-#endif
-#endif
-
 #include <stdio.h>
 
 /* Comment out all this code if we are using the GNU C Library, and are not
diff --git a/Build/source/texk/kpathsea/strcasecmp.c b/Build/source/texk/kpathsea/strcasecmp.c
index 9bab6319cd1..28a6d7b8481 100644
--- a/Build/source/texk/kpathsea/strcasecmp.c
+++ b/Build/source/texk/kpathsea/strcasecmp.c
@@ -1,6 +1,6 @@
 /* strcasecmp.c - case-insensitive strcmp
 
-   Copyright 2008 Karl Berry.
+   Copyright 2008, 2010 Karl Berry.
    Copyright 1991, 1992, 1995 Free Software Foundation, Inc.
    This file was part of the GNU C Library.
    Modified by Karl Berry for kpathsea.
@@ -22,14 +22,6 @@
 #include <config.h>
 #endif
 
-#if !defined (__STDC__) || !__STDC__
-/* This is a separate conditional since some stdc systems
-   reject `defined (const)'.  */
-#ifndef const
-#define const
-#endif
-#endif
-
 #include <ctype.h>
 
 /* Compare S1 and S2, ignoring case, returning less than, equal to or
diff --git a/Build/source/texk/kpathsea/strstr.c b/Build/source/texk/kpathsea/strstr.c
index bbd453b762a..9aa885f5bc3 100644
--- a/Build/source/texk/kpathsea/strstr.c
+++ b/Build/source/texk/kpathsea/strstr.c
@@ -1,6 +1,6 @@
 /* strstr.c - search for a substring in string.
 
-   Copyright 2008 Karl Berry.
+   Copyright 2008, 2010 Karl Berry.
    Copyright 1994, 1995 Free Software Foundation, Inc.
    This file was part of the GNU C Library.
    Modified for kpathsea by Karl Berry.
@@ -27,12 +27,8 @@
  *
  * Stephen R. van den Berg, berg@pool.informatik.rwth-aachen.de	*/
 
-#if !defined (__STDC__) || !__STDC__
-/* This is a separate conditional since some stdc systems
-   reject `defined (const)'.  */
-#ifndef const
-#define const
-#endif
+#ifdef HAVE_CONFIG_H
+#include <config.h>
 #endif
 
 typedef unsigned chartype;