diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 70d4f6c83ff..a2abac7fe10 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-14  Hui Zhu  <teawater@gmail.com>
+
+	* ui-file.c (stdio_file_write_async_safe): Add empty check for build.
+
 2011-05-13  Doug Evans  <dje@google.com>
 
 	Support $pdir and $sdir in libthread-db-search-path.
diff --git a/gdb/ui-file.c b/gdb/ui-file.c
index 20b072e5917..6bb2342e746 100644
--- a/gdb/ui-file.c
+++ b/gdb/ui-file.c
@@ -580,7 +580,8 @@ stdio_file_write_async_safe (struct ui_file *file,
       return;
     }
 
-  write (stdio->fd, buf, length_buf);
+  if (write (stdio->fd, buf, length_buf))
+    ;
 }
 
 static void