Merge GDB 7.5.1

gdb/common/vec.c

 /* 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/>.  */
 
+#ifdef GDBSERVER
+#include "server.h"
+#else
 #include "defs.h"
+#endif
+
 #include "vec.h"
 
 struct vec_prefix
 {
   unsigned num;
   unsigned alloc;
   void *vec[1];
 };
 
 /* Calculate the new ALLOC value, making sure that abs(RESERVE) slots
@@ skipping 78 matching lines @@
 DEF_VEC_I (int);
 typedef struct X
 {
   int i;
 } obj_t;
 typedef obj_t *ptr_t;
 
 DEF_VEC_P (ptr_t);
 DEF_VEC_O (obj_t);
 #endif