Merge

bk: 42c264d9flXLRB-MEnw83cH0ZHrphA

diff --cc configure.ac
Simple merge

diff --cc ntpq/ntpq.c
index dc83ec3c6dc1b559230a2a20f1957588a19089a4,6994e36a87ea1962cab914304933830732a8b99d..40ce6b4655b9ffcec39ab5635cdd36dfb38ee361
--- 1/ntpq/ntpq.c
--- 2/ntpq/ntpq.c
+++ b/ntpq/ntpq.c
@@@ -493,9 -493,12 +493,9 @@@ ntpqmain
        char *argv[]
        )
  {
 -      int c;
 -      int errflg = 0;
        extern int ntp_optind;
 -      extern char *ntp_optarg;
  
- #ifdef NO_MAIN_ALLOWED
+ #ifdef SYS_VXWORKS
        clear_globals();
        taskPrioritySet(taskIdSelf(), 100 );
  #endif