Protect COMMAND since we use it as an autogen keyword

bk: 44986bb5uIBau9op6b_-fj9gsQXl2A

diff --git a/ntpdc/ntpdc.c b/ntpdc/ntpdc.c
index f432ed996ffcf408887d991894c847dde40301fd..d826503d73567912ca2cb6ccc3d5a0b3613f9245 100644 (file)
--- 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 56a0d16891be825cf6347ed704afe308ae32722d..c702c3f01bb7d1779b42b552559b7d820c29ec16 100644 (file)
--- 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
 
 /*