struct breakpoint: Fix indentation

[deliverable/binutils-gdb.git] / gdb / common / xml-utils.c

diff --git a/gdb/common/xml-utils.c b/gdb/common/xml-utils.c
index 89093cf8e51e27357e3d6194c106555c4cf8925d..b5fe442d75fbcbf3d629e1ccb81074ee6f093bed 100644 (file)
--- a/gdb/common/xml-utils.c
+++ b/gdb/common/xml-utils.c
@@ -1,6 +1,6 @@
 /* Shared helper routines for manipulating XML.
 
-   Copyright (C) 2006-2013 Free Software Foundation, Inc.
+   Copyright (C) 2006-2017 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -17,16 +17,9 @@
    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 "xml-utils.h"
 
-#include <string.h>
-
 /* Return a malloc allocated string with special characters from TEXT
    replaced by entity references.  */
 
@@ -56,7 +49,7 @@ xml_escape_text (const char *text)
       }
 
   /* Expand the result.  */
-  result = xmalloc (i + special + 1);
+  result = (char *) xmalloc (i + special + 1);
   for (i = 0, special = 0; text[i] != '\0'; i++)
     switch (text[i])
       {