libiberty: fix warnings about left shifting a negative value.

[deliverable/binutils-gdb.git] / libiberty / setenv.c

diff --git a/libiberty/setenv.c b/libiberty/setenv.c
index 921e9688601d1b1ec5ceacd7771b871ad88ca8c9..5b51193319de57d81f8f7f9c751175850f107819 100644 (file)
--- a/libiberty/setenv.c
+++ b/libiberty/setenv.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 1992, 1995, 1996, 1997, 2002, 2011 Free Software Foundation,
-   Inc.
+/* Copyright (C) 1992, 1995, 1996, 1997, 2002, 2011, 2015
+   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 +62,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