From 31cd589d20ba8d3d6b3fc4fccacc40d38a163c5d Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Thu, 19 Sep 2024 06:52:31 +0200
Subject: Adding upstream version 4.99.5.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 missing/datalinks.c   | 2 --
 missing/dlnames.c     | 2 --
 missing/getopt_long.c | 3 +--
 missing/getservent.c  | 2 --
 missing/snprintf.c    | 2 --
 missing/strlcat.c     | 2 --
 missing/strlcpy.c     | 2 --
 missing/strsep.c      | 2 --
 8 files changed, 1 insertion(+), 16 deletions(-)

(limited to 'missing')

diff --git a/missing/datalinks.c b/missing/datalinks.c
index 17f60be..8b45836 100644
--- a/missing/datalinks.c
+++ b/missing/datalinks.c
@@ -31,9 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <netdissect-stdinc.h>
 
diff --git a/missing/dlnames.c b/missing/dlnames.c
index 03c2b38..87cfb38 100644
--- a/missing/dlnames.c
+++ b/missing/dlnames.c
@@ -31,9 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <netdissect-stdinc.h>
 
diff --git a/missing/getopt_long.c b/missing/getopt_long.c
index ece0006..e9b1ef5 100644
--- a/missing/getopt_long.c
+++ b/missing/getopt_long.c
@@ -419,8 +419,7 @@ start:
 				permute_args(nonopt_start, nonopt_end,
 				    optind, nargv);
 				optind -= nonopt_end - nonopt_start;
-			}
-			else if (nonopt_start != -1) {
+			} else if (nonopt_start != -1) {
 				/*
 				 * If we skipped non-options, set optind
 				 * to the first of them.
diff --git a/missing/getservent.c b/missing/getservent.c
index 39cee06..4da2480 100644
--- a/missing/getservent.c
+++ b/missing/getservent.c
@@ -34,9 +34,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <netdissect-stdinc.h>
 #include <getservent.h>
diff --git a/missing/snprintf.c b/missing/snprintf.c
index dfff6ee..52eb9a6 100644
--- a/missing/snprintf.c
+++ b/missing/snprintf.c
@@ -31,9 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <stdio.h>
 #include <stdarg.h>
diff --git a/missing/strlcat.c b/missing/strlcat.c
index fab7d04..9b64465 100644
--- a/missing/strlcat.c
+++ b/missing/strlcat.c
@@ -28,9 +28,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <netdissect-stdinc.h>
 
diff --git a/missing/strlcpy.c b/missing/strlcpy.c
index 9a0b6e6..00792bc 100644
--- a/missing/strlcpy.c
+++ b/missing/strlcpy.c
@@ -28,9 +28,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <netdissect-stdinc.h>
 
diff --git a/missing/strsep.c b/missing/strsep.c
index 05f10bc..a07660c 100644
--- a/missing/strsep.c
+++ b/missing/strsep.c
@@ -31,9 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <netdissect-stdinc.h>
 
-- 
cgit v1.2.3