Support fusion for ELFv2 stubs

[deliverable/binutils-gdb.git] / gdb / environ.c

diff --git a/gdb/environ.c b/gdb/environ.c
index ebd6431801e86c88239895fa3789429d86916b65..7092a1a3c95d364aafef03b4ee9c9f28fb6cedf4 100644 (file)
--- a/gdb/environ.c
+++ b/gdb/environ.c
@@ -1,7 +1,6 @@
 /* environ.c -- library for manipulating environments for GNU.
 
-   Copyright (C) 1986, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 2000, 2005
-   2003, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1986-2014 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,7 +20,7 @@
 
 #include "defs.h"
 #include "environ.h"
-#include "gdb_string.h"
+#include <string.h>
 \f
 
 /* Return a new environment object.  */
@@ -175,7 +174,7 @@ unset_in_environ (struct gdb_environ *e, char *var)
          xfree (s);
          /* Walk through the vector, shuffling args down by one, including
             the NULL terminator.  Can't use memcpy() here since the regions
-            overlap, and memmove() might not be available. */
+            overlap, and memmove() might not be available.  */
          while ((vector[0] = vector[1]) != NULL)
            {
              vector++;