From: Juergen Perlinger <perlinger@ntp.org>
Date: Thu, 16 May 2019 18:51:13 +0000 (+0200)
Subject: [Bug 3510] Flatten out the #ifdef nesting in ntpdmain()
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5750328e7e054d2d741674fd7dc1a2cdc172c7d;p=thirdparty%2Fntp.git

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

bk: 5cddb121D-VWNl22mG2TMV3PABbi3A
---

diff --git a/ChangeLog b/ChangeLog
index 8cd0cca10..11b80fb62 100644
--- 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 2b14431dc..d3b323fec 100644
--- 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
 /*