From 887b7e6fe2bddfda218b203882c10bbfcbb85ebe Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Fri, 27 Feb 2009 09:56:47 +0000 Subject: port from new build system git-svn-id: svn://tug.org/texlive/trunk@12248 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/kpathsea/ChangeLog | 4 ++++ Build/source/texk/kpathsea/common.ac | 2 +- Build/source/texk/kpathsea/xputenv.c | 6 +++--- 3 files changed, 8 insertions(+), 4 deletions(-) (limited to 'Build/source/texk') diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog index 606842e1f9e..44b9c2e0737 100644 --- a/Build/source/texk/kpathsea/ChangeLog +++ b/Build/source/texk/kpathsea/ChangeLog @@ -7,6 +7,10 @@ * tex-file.c: doc fixes. +2009-02-12 Peter Breitenlohner + + * xputenv.c: prototype for putenv() if !HAVE_DECL_PUTENV. + 2009-02-06 Karl Berry * texmf.cnf (TEXINPUTS.lua*): add definitions for diff --git a/Build/source/texk/kpathsea/common.ac b/Build/source/texk/kpathsea/common.ac index 793715a7384..79d0789f750 100644 --- a/Build/source/texk/kpathsea/common.ac +++ b/Build/source/texk/kpathsea/common.ac @@ -22,7 +22,7 @@ AC_HEADER_STDC AC_FUNC_CLOSEDIR_VOID AC_CHECK_HEADERS([assert.h float.h limits.h memory.h pwd.h stdlib.h \ string.h strings.h sys/param.h unistd.h]) -AC_CHECK_DECLS([strstr]) +AC_CHECK_DECLS([putenv, strstr]) dnl Libtool supporting objects that may be required on ancient broken system. AC_CHECK_FUNCS(putenv,, LTLIBOBJS="$LTLIBOBJS putenv.lo") diff --git a/Build/source/texk/kpathsea/xputenv.c b/Build/source/texk/kpathsea/xputenv.c index 52aa0f44fbf..a42485000b3 100644 --- a/Build/source/texk/kpathsea/xputenv.c +++ b/Build/source/texk/kpathsea/xputenv.c @@ -22,9 +22,9 @@ #ifdef WIN32 #include #else -/* Avoid implicit declaration warning. But since some systems do - declare it, don't use a prototype, for fear of conflicts. */ -extern int putenv (); +#if !HAVE_DECL_PUTENV +extern int putenv P1H(char* entry); +#endif #endif /* not WIN32 */ /* These record the strings we've set and have to keep around. -- cgit v1.2.3