From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 28 Jul 2015 09:36:24 +0000 (+0000)
Subject: Typo fix for GCC warning suppression.  Harlan Stenn.
X-Git-Tag: NTP_4_3_66~2^2^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e2af02f74343665910db5ec64fb8af91935430d;p=thirdparty%2Fntp.git

Typo fix for GCC warning suppression.  Harlan Stenn.

bk: 55b74d182VResejbq6okQvYHf_B1tA
---

diff --git a/ChangeLog b/ChangeLog
index e2a0d2943..ad133668a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -98,6 +98,7 @@ fixed formatting. Tomasz Flendrich
   Tomasz Flendrich
 * Changed progname to be const in many files - now it's consistent. Tomasz
   Flendrich
+* Typo fix for GCC warning suppression.  Harlan Stenn.
 ---
 (4.2.8p3) 2015/06/29 Released by Harlan Stenn <stenn@ntp.org>
 
diff --git a/ntpd/ntp_config.c b/ntpd/ntp_config.c
index 041c80705..197900f62 100644
--- a/ntpd/ntp_config.c
+++ b/ntpd/ntp_config.c
@@ -1825,7 +1825,7 @@ config_auth(
 
 	/* Crypto Command */
 #ifdef AUTOKEY
-# ifdef GCC
+# ifdef __GNUC__
 	item = -1;	/* quiet warning */
 # endif
 	my_val = HEAD_PFIFO(ptree->auth.crypto_cmd_list);
@@ -1980,7 +1980,7 @@ config_tos(
 	int		item;
 	double		val;
 
-#ifdef GCC
+#ifdef __GNUC__
 	item = -1;	/* quiet warning */
 #endif
 	tos = HEAD_PFIFO(ptree->orphan_cmds);
@@ -2665,7 +2665,7 @@ config_tinker(
 	attr_val *	tinker;
 	int		item;
 
-#ifdef GCC
+#ifdef __GNUC__
 	item = -1;	/* quiet warning */
 #endif
 	tinker = HEAD_PFIFO(ptree->tinker);
@@ -2781,7 +2781,7 @@ config_nic_rules(
 		switch (curr_node->match_class) {
 
 		default:
-#ifdef GCC
+#ifdef __GNUC__
 			/*
 			 * this assignment quiets a gcc "may be used
 			 * uninitialized" warning and is here for no
@@ -2841,7 +2841,7 @@ config_nic_rules(
 		switch (curr_node->action) {
 
 		default:
-#ifdef GCC
+#ifdef __GNUC__
 			/*
 			 * this assignment quiets a gcc "may be used
 			 * uninitialized" warning and is here for no
diff --git a/ntpd/ntp_proto.c b/ntpd/ntp_proto.c
index b0c3532f1..44f66ef6d 100644
--- a/ntpd/ntp_proto.c
+++ b/ntpd/ntp_proto.c
@@ -1540,7 +1540,7 @@ process_packet(
 	sys_processed++;
 	peer->processed++;
 	p_del = FPTOD(NTOHS_FP(pkt->rootdelay));
-#ifdef GCC
+#ifdef __GNUC__
 	p_offset = 0;		/* quiet bogus uninitialized value warning */
 #endif
 	p_disp = FPTOD(NTOHS_FP(pkt->rootdisp));