summaryrefslogtreecommitdiff
path: root/Build/source/texk
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-01-02 01:05:21 +0000
committerKarl Berry <karl@freefriends.org>2008-01-02 01:05:21 +0000
commit54839d302f99db85eaf56803be35707080e0299d (patch)
treefe4de764ddf12d6fa751c616e5263b2fac622d2f /Build/source/texk
parented812004bcf0428e4073498a66aefc69a7f0e419 (diff)
default to void * for malloc and friends
git-svn-id: svn://tug.org/texlive/trunk@6023 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
-rw-r--r--Build/source/texk/kpathsea/ChangeLog6
-rw-r--r--Build/source/texk/kpathsea/c-std.h6
2 files changed, 7 insertions, 5 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 89456f558be..bfa215f357e 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-02 Karl Berry <karl@tug.org>
+
+ * c-std.h (ALLOC_RETURN_TYPE) [!STDC_HEADERS]: just use void in
+ the unlikely event we're declaring *alloc ourselves. No modern
+ system uses char * for them.
+
2007-12-23 Karl Berry <karl@tug.org>
* kpsewhich.c (subdir_match): new fn.
diff --git a/Build/source/texk/kpathsea/c-std.h b/Build/source/texk/kpathsea/c-std.h
index 448addfa412..181a3ff6094 100644
--- a/Build/source/texk/kpathsea/c-std.h
+++ b/Build/source/texk/kpathsea/c-std.h
@@ -1,7 +1,7 @@
/* c-std.h: the first header files.
Copyright 1999, 2005 Olaf Weber
- Copyright 1992, 93, 94, 95, 96, 97 Karl Berry.
+ Copyright 1992, 1993, 1994, 1995, 1996, 1997, 2008 Karl Berry.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -51,11 +51,7 @@ extern char *getenv ();
#else
#ifndef STDC_HEADERS
#ifndef ALLOC_RETURN_TYPE
-#ifdef DOSISH
#define ALLOC_RETURN_TYPE void
-#else
-#define ALLOC_RETURN_TYPE char
-#endif /* not DOSISH */
#endif /* not ALLOC_RETURN_TYPE */
extern ALLOC_RETURN_TYPE *calloc (), *malloc (), *realloc ();
#endif /* not STDC_HEADERS */