X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=libiberty%2Fsetenv.c;h=6eb4cd6f5f0dc1af4cba3613bc71bdf29539c088;hb=7243d0118af6f72e3e72db1eb66941fec4530963;hp=921e9688601d1b1ec5ceacd7771b871ad88ca8c9;hpb=72edb7c28f204d6c0512612968482803747b6d4f;p=deliverable%2Fbinutils-gdb.git

diff --git a/libiberty/setenv.c b/libiberty/setenv.c
index 921e968860..6eb4cd6f5f 100644
--- a/libiberty/setenv.c
+++ b/libiberty/setenv.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 1992, 1995, 1996, 1997, 2002, 2011 Free Software Foundation,
-   Inc.
+/* Copyright (C) 1992-2018 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
@@ -62,12 +61,7 @@ extern int errno;
 #endif
 
 #define __environ	environ
-#ifndef HAVE_ENVIRON_DECL
-/* MinGW defines environ to call a function.  */
-#ifndef environ
-extern char **environ;
-#endif
-#endif
+#include "environ.h"
 
 #undef setenv
 #undef unsetenv