X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=pciutils.h;h=020c02a1c668f92a6c7dd4761f5e61b0637680b4;hb=7b65e5e1f3fe62d9da11c0ac1bf526a930b7bac8;hp=1de2b01fcd7315faf367d967d0995c785a6c37a2;hpb=d1d7d88a5d0009a9a01f623f887bef2bdc3728d3;p=pciutils.git

diff --git a/pciutils.h b/pciutils.h
index 1de2b01..020c02a 100644
--- a/pciutils.h
+++ b/pciutils.h
@@ -1,18 +1,35 @@
 /*
  *	The PCI Utilities -- Declarations
  *
- *	Copyright (c) 1997--2016 Martin Mares <mj@ucw.cz>
+ *	Copyright (c) 1997--2018 Martin Mares <mj@ucw.cz>
  *
- *	Can be freely distributed and used under the terms of the GNU GPL.
+ *	Can be freely distributed and used under the terms of the GNU GPL v2+
+ *
+ *	SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "lib/pci.h"
 #include "lib/sysdep.h"
+#include "bitops.h"
 
-#ifdef PCI_OS_WINDOWS
+/*
+ * gcc predefines macro __MINGW32__ for all MinGW targets.
+ * Including some MinGW header (e.g. windef.h) defines additional
+ * macro __MINGW32_MAJOR_VERSION (available for all MinGW targets).
+ */
+#if defined(PCI_OS_WINDOWS) && defined(__MINGW32__)
+#include <windef.h>
+#endif
+
+/*
+ * On Windows only MinGW 3.0 and higher versions provides <getopt.h>
+ * header file. Older MinGW versions and MSVC do not have it.
+ * DJGPP does not provide <getopt.h>.
+ */
+#if defined(PCI_OS_DJGPP) || (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
@@ -23,7 +40,7 @@ void die(char *msg, ...) NONRET PCI_PRINTF(1,2);
 void *xmalloc(size_t howmuch);
 void *xrealloc(void *ptr, size_t howmuch);
 char *xstrdup(const char *str);
-int parse_generic_option(int i, struct pci_access *pacc, char *optarg);
+int parse_generic_option(int i, struct pci_access *pacc, char *arg);
 
 #ifdef PCI_HAVE_PM_INTEL_CONF
 #define GENOPT_INTEL "H:"