Merge from mainline.

[gnu-emacs] / lib-src / emacsclient.c

diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 84a2208c3e82830bafaa3762577502dfb5e42911..fdcd2c028e358c7a041358ab753b67bf7763b151 100644 (file)
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -74,10 +74,8 @@ char *w32_getenv (char *);
 #include <stdarg.h>
 #include <ctype.h>
 #include <stdio.h>
-#include "getopt.h"
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <getopt.h>
+#include <unistd.h>
 
 #include <pwd.h>
 #include <sys/stat.h>