Re: [bug-inetutils] inetutil-1.4.2 build failed on solaris 2.6

[Alain Magloire]

> 
> On Mon, Dec 23, 2002 at 11:14:48AM -0500, Alain Magloire wrote:
> 
> > Yea, it seems there are a few problems:
> > xmalloc.c uses error.h and the non-posix error() function
> > setenv.c uses __environ.
> > 
> > Need a patch jeff ?
> 
> If you've got time - All of the files should be in gnulib.
> 
> Basically, (Jim?  Karl?  Someone...) is looking at redoing the structure
> of gnulib to cope with this problem.  This thing is that it's hard to
> tell which files need to be brought over when updating lib/.
> 
> I can't really look at this for a couple of days. =(
> 

Ok, but I'm not at home(no commit), so patch inline, nothing fancy

        * libinetutils/xmalloc.c: <error.h> is not provided but
        we already have an err.h reuse it.
        * libinetutils/setenv.c:  Check for _LIBC macro if not
        define declare extern char **environ.
===============================================================
--- xmalloc.c.orig      Mon Dec 23 11:27:12 2002
+++ xmalloc.c   Mon Dec 23 11:20:14 2002
@@ -34,7 +34,7 @@
 #define _(msgid) gettext (msgid)
 #define N_(msgid) msgid
 
-#include "error.h"
+#include "err.h"
 #include "xalloc.h"
 
 #ifndef EXIT_FAILURE
@@ -67,7 +67,7 @@
 {
   if (xalloc_fail_func)
     (*xalloc_fail_func) ();
-  error (xalloc_exit_failure, 0, "%s", _(xalloc_msg_memory_exhausted));
+  err (xalloc_exit_failure, 0, "%s", _(xalloc_msg_memory_exhausted));
   /* The `noreturn' cannot be given to error, since it may return if
      its first argument is 0.  To help compilers understand the
      xalloc_die does terminate, call exit. */
--- setenv.c.orig       Mon Dec 23 11:27:24 2002
+++ setenv.c    Mon Dec 23 11:25:13 2002
@@ -34,9 +34,13 @@
 # include <unistd.h>
 #endif
 
-#ifndef        HAVE_GNU_LD
-# define __environ     environ
+#if _LIBC - 0 == 0
+# define __environ      environ
+# ifndef HAVE_ENVIRON_DECL
+extern char **environ;
+# endif
 #endif
+
 
 int
 setenv (name, value, replace)