x86: Rename match_reg_size to match_operand_size

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

diff --git a/libiberty/setenv.c b/libiberty/setenv.c
index 96917d5769f484e8f923de5ec75278b4319be6fe..6eb4cd6f5f0dc1af4cba3613bc71bdf29539c088 100644 (file)
--- 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,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