From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 29 Jun 2005 09:07:37 +0000 (-0400)
Subject: Merge
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=efc3d736b3bd3ca317b68f694136cfbef838940c;p=thirdparty%2Fntp.git

Merge

bk: 42c264d9flXLRB-MEnw83cH0ZHrphA
---

efc3d736b3bd3ca317b68f694136cfbef838940c
diff --cc ntpq/ntpq.c
index dc83ec3c6d,6994e36a87..40ce6b4655
--- a/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