X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fcommon%2Fcommon-utils.c;h=2925dd5660a9f8a0517a462774e9cab5c44527d2;hb=c4b0b099b884e73d883f2b8c3ea8ffc9dc678902;hp=3fe9bf952c0d57059e4ce53e37a5e0eafd64d755;hpb=dccbb60975cdbcd6a906a79d0c4308b040fdac1b;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/common/common-utils.c b/gdb/common/common-utils.c
index 3fe9bf952c..2925dd5660 100644
--- a/gdb/common/common-utils.c
+++ b/gdb/common/common-utils.c
@@ -1,6 +1,6 @@
 /* Shared general utility routines for GDB, the GNU debugger.
 
-   Copyright (C) 1986-2014 Free Software Foundation, Inc.
+   Copyright (C) 1986-2015 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -17,13 +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 <string.h>
+#include "common-defs.h"
 
 /* The xmalloc() (libiberty.h) family of memory management routines.