Imported Upstream version 7.9

[platform/upstream/gdb.git] / gdb / common / format.c

diff --git a/gdb/common/format.c b/gdb/common/format.c
index bddfbc6..deea93c 100644 (file)
--- a/gdb/common/format.c
+++ b/gdb/common/format.c
@@ -1,6 +1,6 @@
 /* Parse a printf-style format string.
 
-   Copyright (C) 1986-2014 Free Software Foundation, Inc.
+   Copyright (C) 1986-2015 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -17,14 +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"
 #include "format.h"
 
 struct format_piece *