Fix regression: cannot start with LD_PRELOAD=libSegFault.so (PR gdb/18653#c7)

[deliverable/binutils-gdb.git] / gdb / common / vec.c

diff --git a/gdb/common/vec.c b/gdb/common/vec.c
index 2a82afb9e3bdf985d9a75c071254c06fe856e303..3c31a3d88b052311317baf525c0fab045bced445 100644 (file)
--- a/gdb/common/vec.c
+++ b/gdb/common/vec.c
@@ -1,5 +1,5 @@
 /* Vector API for GDB.
-   Copyright (C) 2004-2013 Free Software Foundation, Inc.
+   Copyright (C) 2004-2018 Free Software Foundation, Inc.
    Contributed by Nathan Sidwell <nathan@codesourcery.com>
 
    This file is part of GDB.
@@ -17,12 +17,7 @@
    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 "common-defs.h"
 #include "vec.h"
 
 struct vec_prefix
@@ -95,7 +90,7 @@ vec_p_reserve (void *vec, int reserve)
 void *
 vec_o_reserve (void *vec, int reserve, size_t vec_offset, size_t elt_size)
 {
-  struct vec_prefix *pfx = vec;
+  struct vec_prefix *pfx = (struct vec_prefix *) vec;
   unsigned alloc = calculate_allocation (pfx, reserve);
 
   if (!alloc)