summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2006-12-09 14:44:18 +0000
committerKarl Berry <karl@freefriends.org>2006-12-09 14:44:18 +0000
commit505d3208d7cab78f3526c81018325bc3e531fd79 (patch)
treed0bd2611c57683f5fd3ece18c9621ac3badf4d7d /Build
parent556702aa8fb313e0e58bfc065aa9f76893cf521b (diff)
do not include strings.h if we have string.h (from vvv)
git-svn-id: svn://tug.org/texlive/trunk@2654 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/kpathsea/ChangeLog5
-rw-r--r--Build/source/texk/kpathsea/c-memstr.h8
2 files changed, 10 insertions, 3 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 9fb7bcb853c..e04c8767a89 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-09 Karl Berry <karl@tug.org>
+
+ * c-memstr.h (strings.h): don't include if HAVE_STRING_H (as all
+ systems should, these days). Reported by vvv.
+
2006-07-15 Karl Berry <karl@tug.org>
* expand.c (kpse_expand_kpse_dot): omit empty path elements from
diff --git a/Build/source/texk/kpathsea/c-memstr.h b/Build/source/texk/kpathsea/c-memstr.h
index 4f85cdf3938..2bc3d0ef696 100644
--- a/Build/source/texk/kpathsea/c-memstr.h
+++ b/Build/source/texk/kpathsea/c-memstr.h
@@ -1,7 +1,7 @@
/* c-memstr.h: memcpy, strchr, etc.
- Copyright 1998, 1999, 2000, 2004, 2005 Olaf Weber.
- Copyright 1992, 93, 94, 95, 97 Karl Berry.
+ Copyright 1992, 1993, 1994, 1995, 1997 1998, 1999, 2000, 2004, 2005,
+ 2006 Karl Berry and Olaf Weber.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -27,10 +27,12 @@
#ifdef HAVE_STRING_H
#include <string.h>
-#endif
+#else
+/* don't ever want both string.h and strings.h; fails on AIX. */
#ifdef HAVE_STRINGS_H
#include <strings.h>
#endif
+#endif
/* An ANSI string.h and pre-ANSI memory.h might conflict. */
#if !defined (STDC_HEADERS) && defined (HAVE_MEMORY_H)