diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index c57ccefc4b..c764d97239 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-23  Yao Qi  <yao@codesourcery.com>
+
+	* server.h: Remove declaration of 'xsnprintf'.
+
 2012-08-22  Keith Seitz  <keiths@redhat.com>
 
 	* server.h: Include build-gnulib-gbserver/config.h.
diff --git a/gdb/gdbserver/server.h b/gdb/gdbserver/server.h
index fd6fd2689e..a6ba0dbfc7 100644
--- a/gdb/gdbserver/server.h
+++ b/gdb/gdbserver/server.h
@@ -368,9 +368,8 @@ void *xmalloc (size_t) ATTR_MALLOC;
 void *xrealloc (void *, size_t);
 void *xcalloc (size_t, size_t) ATTR_MALLOC;
 char *xstrdup (const char *) ATTR_MALLOC;
-int xsnprintf (char *str, size_t size, const char *format, ...)
-  ATTR_FORMAT (printf, 3, 4);;
 void freeargv (char **argv);
+
 void perror_with_name (const char *string);
 void error (const char *string,...) ATTR_NORETURN ATTR_FORMAT (printf, 1, 2);
 void fatal (const char *string,...) ATTR_NORETURN ATTR_FORMAT (printf, 1, 2);