From eea302037a35add252f2428a463dc7796d67e192 Mon Sep 17 00:00:00 2001
From: DJ Delorie <dj@redhat.com>
Date: Sun, 17 Mar 2013 21:25:53 +0000
Subject: merge from gcc

---
 libiberty/setenv.c | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'libiberty/setenv.c')

diff --git a/libiberty/setenv.c b/libiberty/setenv.c
index 921e968..96917d5 100644
--- a/libiberty/setenv.c
+++ b/libiberty/setenv.c
@@ -63,11 +63,8 @@ extern int errno;
 
 #define __environ	environ
 #ifndef HAVE_ENVIRON_DECL
-/* MinGW defines environ to call a function.  */
-#ifndef environ
 extern char **environ;
 #endif
-#endif
 
 #undef setenv
 #undef unsetenv
-- 
cgit v1.1