[Bug 3510] Flatten out the #ifdef nesting in ntpdmain()

bk: 5cddb121D-VWNl22mG2TMV3PABbi3A

diff --git a/ChangeLog b/ChangeLog
index 8cd0cca10e91fce3042ab1640f6ea03956f3d046..11b80fb62066e5d82aae4df742484487f371eef6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
   - patch by Philipp Prindeville
 * [Bug 3511] Get rid of AC_LANG_SOURCE() warnings <perlinger@ntp.org>
   - patch by Philipp Prindeville
+* [Bug 3510] Flatten out the #ifdef nesting in ntpdmain() <perlinger@ntp.org>
+  - partial application of patch by Philipp Prindeville
 
 ---
 (4.2.8p13) 2019/03/07 Released by Harlan Stenn <stenn@ntp.org>

diff --git a/ntpd/ntpd.c b/ntpd/ntpd.c
index 2b14431dc7b4113b2c4bca3b89e4be1185f2ef0b..d3b323feced6d48220b940ad4a5de8d4ea578f5a 100644 (file)
--- a/ntpd/ntpd.c
+++ b/ntpd/ntpd.c
@@ -391,11 +391,9 @@ main(
 
        return ntpsim(argc, argv);
 }
-#else  /* !SIM follows */
-#ifdef NO_MAIN_ALLOWED
+#elif defined(NO_MAIN_ALLOWED)
 CALL(ntpd,"ntpd",ntpdmain);
-#else  /* !NO_MAIN_ALLOWED follows */
-#ifndef SYS_WINNT
+#elif !defined(SYS_WINNT)
 int
 main(
        int argc,
@@ -405,8 +403,6 @@ main(
        return ntpdmain(argc, argv);
 }
 #endif /* !SYS_WINNT */
-#endif /* !NO_MAIN_ALLOWED */
-#endif /* !SIM */
 
 #ifdef _AIX
 /*