Merge GDB 7.5.1

gdb/common/vec.h

 /* Vector API for GDB.
    Copyright (C) 2004-2012 Free Software Foundation, Inc.
    Contributed by Nathan Sidwell <nathan@codesourcery.com>
 
    This file is part of GDB.
 
    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
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #if !defined (GDB_VEC_H)
 #define GDB_VEC_H
 
 #include <stddef.h>
+
+#ifndef GDBSERVER
 #include "gdb_string.h"
 #include "gdb_assert.h"
+#endif
 
 /* The macros here implement a set of templated vector types and
    associated interfaces.  These templates are implemented with
    macros, as we're not in C++ land.  The interface functions are
    typesafe and use static inline functions, sometimes backed by
    out-of-line generic functions.
 
    Because of the different behavior of structure objects, scalar
    objects and of pointers, there are three flavors, one for each of
    these variants.  Both the structure object and pointer variants
@@ skipping 988 matching lines @@
                                                                           \
 static inline T *VEC_OP (T,safe_insert)                                   \
      (VEC(T) **vec_, unsigned ix_, const T *obj_ VEC_ASSERT_DECL)         \
 {                                                                         \
   VEC_OP (T,reserve) (vec_, 1 VEC_ASSERT_PASS);                           \
                                                                           \
   return VEC_OP (T,quick_insert) (*vec_, ix_, obj_ VEC_ASSERT_PASS);      \
 }
 
 #endif /* GDB_VEC_H */