From: Martin Mares <mj@ucw.cz>
Date: Sun, 18 Feb 2024 11:10:21 +0000 (+0100)
Subject: Let us use <getopt.h> everywhere
X-Git-Tag: v3.11.0~30
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=37ccbb7e3f7db7d98b3f3c092bc30bbd405e6796;p=pciutils.git

Let us use <getopt.h> everywhere

It is needed by pcilmr anyway.

If it turns out to be missing on your system, please extend
the condition for use of compat/getopt.h in pciutils.h.
---

diff --git a/pcilmr.c b/pcilmr.c
index 8cb5eee..cb8bd77 100644
--- a/pcilmr.c
+++ b/pcilmr.c
@@ -8,7 +8,6 @@
  *	SPDX-License-Identifier: GPL-2.0-or-later
  */
 
-#include <getopt.h>
 #include <memory.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/pciutils.h b/pciutils.h
index 036f0dc..53e0ee1 100644
--- a/pciutils.h
+++ b/pciutils.h
@@ -28,7 +28,7 @@
 #if defined(PCI_OS_WINDOWS) && !(defined(__MINGW32_MAJOR_VERSION) && __MINGW32_MAJOR_VERSION >= 3)
 #include "compat/getopt.h"
 #else
-#include <unistd.h>
+#include <getopt.h>
 #endif
 
 #define PCIUTILS_VERSION PCILIB_VERSION