X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=libiberty%2Fsetenv.c;h=2ceabe1317e85beb555cea92e6551d59ff67bbe1;hb=735fc2ca685b55bf1debbfcea6d2ab544e58a530;hp=355af5a9dd673831c4feb0f45630feeb252294a9;hpb=abf6a75b428517d9caaf9155212b0b10e0379a99;p=deliverable%2Fbinutils-gdb.git

diff --git a/libiberty/setenv.c b/libiberty/setenv.c
index 355af5a9dd..2ceabe1317 100644
--- a/libiberty/setenv.c
+++ b/libiberty/setenv.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1995, 1996, 1997, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1992-2019 Free Software Foundation, Inc.
    This file based on setenv.c in the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -19,7 +19,8 @@
 
 /*
 
-@deftypefn Supplemental int setenv (const char *@var{name}, const char *@var{value}, int @var{overwrite})
+@deftypefn Supplemental int setenv (const char *@var{name}, @
+  const char *@var{value}, int @var{overwrite})
 @deftypefnx Supplemental void unsetenv (const char *@var{name})
 
 @code{setenv} adds @var{name} to the environment with value
@@ -60,9 +61,7 @@ extern int errno;
 #endif
 
 #define __environ	environ
-#ifndef HAVE_ENVIRON_DECL
-extern char **environ;
-#endif
+#include "environ.h"
 
 #undef setenv
 #undef unsetenv