From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 20 Jun 2006 21:42:13 +0000 (-0400)
Subject: Protect COMMAND since we use it as an autogen keyword
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aec9a65eb42f26a4bbd7ec691214cc0b143b99b3;p=thirdparty%2Fntp.git

Protect COMMAND since we use it as an autogen keyword

bk: 44986bb5uIBau9op6b_-fj9gsQXl2A
---

diff --git a/ntpdc/ntpdc.c b/ntpdc/ntpdc.c
index f432ed996f..d826503d73 100644
--- a/ntpdc/ntpdc.c
+++ b/ntpdc/ntpdc.c
@@ -20,7 +20,7 @@
 #include "ntpdc-opts.h"
 
 #ifdef SYS_WINNT
-#include <Mswsock.h>
+# include <Mswsock.h>
 # include <io.h>
 #else
 # define closesocket close
@@ -32,9 +32,14 @@
 #endif /* HAVE_LIBREADLINE || HAVE_LIBEDIT */
 
 #ifdef SYS_VXWORKS
-/* vxWorks needs mode flag -casey*/
-#define open(name, flags)   open(name, flags, 0777)
-#define SERVER_PORT_NUM     123
+				/* vxWorks needs mode flag -casey*/
+# define open(name, flags)   open(name, flags, 0777)
+# define SERVER_PORT_NUM     123
+#endif
+
+/* We use COMMAND as an autogen keyword */
+#ifdef COMMAND
+# undef COMMAND
 #endif
 
 /*
diff --git a/ntpq/ntpq.c b/ntpq/ntpq.c
index 56a0d16891..c702c3f01b 100644
--- a/ntpq/ntpq.c
+++ b/ntpq/ntpq.c
@@ -24,10 +24,10 @@
 #include "ntpq-opts.h"
 
 #ifdef SYS_WINNT
-#include <Mswsock.h>
+# include <Mswsock.h>
 # include <io.h>
 #else
-#define closesocket close
+# define closesocket close
 #endif /* SYS_WINNT */
 
 #if defined(HAVE_LIBREADLINE) || defined(HAVE_LIBEDIT)
@@ -36,9 +36,14 @@
 #endif /* HAVE_LIBREADLINE || HAVE_LIBEDIT */
 
 #ifdef SYS_VXWORKS
-/* vxWorks needs mode flag -casey*/
-#define open(name, flags)   open(name, flags, 0777)
-#define SERVER_PORT_NUM     123
+				/* vxWorks needs mode flag -casey*/
+# define open(name, flags)   open(name, flags, 0777)
+# define SERVER_PORT_NUM     123
+#endif
+
+/* we use COMMAND as an autogen keyword */
+#ifdef COMMAND
+# undef COMMAND
 #endif
 
 /*