Typo fix for GCC warning suppression. Harlan Stenn.

bk: 55b74d182VResejbq6okQvYHf_B1tA

diff --git a/ChangeLog b/ChangeLog
index e2a0d29430c170282af23fedeb3a80d33cf24bc8..ad133668a90fd0a6c681d5ad48114b9bc2c7ed04 100644 (file)
--- 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 041c80705b043275c89025b81b0edf048851f369..197900f62b208d0ecc37b4f6ac8cae991da4a6b4 100644 (file)
--- 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 b0c3532f155d78918916a366758da614c40b542d..44f66ef6d4a13b29ab46217523f28326551b30dd 100644 (file)
--- 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));