X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=pciutils.h;h=020c02a1c668f92a6c7dd4761f5e61b0637680b4;hb=9f3d614e4578bdec2b60d97caec400b28d4af9d3;hp=21d46c13896cda0b03f158525bf0562f88a32a36;hpb=f2b31663e67198f49fecb6e9239f529bf8892f3e;p=pciutils.git

diff --git a/pciutils.h b/pciutils.h
index 21d46c1..020c02a 100644
--- a/pciutils.h
+++ b/pciutils.h
@@ -1,16 +1,35 @@
 /*
  *	The PCI Utilities -- Declarations
  *
- *	Copyright (c) 1997--2008 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"
+
+/*
+ * 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
 
-#ifdef PCI_OS_WINDOWS
+/*
+ * 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 <getopt.h>
 #endif
 
 #define PCIUTILS_VERSION PCILIB_VERSION
@@ -18,9 +37,10 @@
 extern const char program_name[];
 
 void die(char *msg, ...) NONRET PCI_PRINTF(1,2);
-void *xmalloc(unsigned int howmuch);
-void *xrealloc(void *ptr, unsigned int howmuch);
-int parse_generic_option(int i, struct pci_access *pacc, char *optarg);
+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 *arg);
 
 #ifdef PCI_HAVE_PM_INTEL_CONF
 #define GENOPT_INTEL "H:"
@@ -29,16 +49,17 @@ int parse_generic_option(int i, struct pci_access *pacc, char *optarg);
 #define GENOPT_INTEL
 #define GENHELP_INTEL
 #endif
-#ifdef PCI_HAVE_PM_DUMP
+#if defined(PCI_HAVE_PM_DUMP) && !defined(PCIUTILS_SETPCI)
 #define GENOPT_DUMP "F:"
-#define GENHELP_DUMP "-F <file>\tRead configuration data from given file\n"
+#define GENHELP_DUMP "-F <file>\tRead PCI configuration dump from a given file\n"
 #else
 #define GENOPT_DUMP
 #define GENHELP_DUMP
 #endif
 
 #define GENERIC_OPTIONS "A:GO:" GENOPT_INTEL GENOPT_DUMP
-#define GENERIC_HELP GENHELP_INTEL GENHELP_DUMP \
+#define GENERIC_HELP \
 	"-A <method>\tUse the specified PCI access method (see `-A help' for a list)\n" \
+	"-O <par>=<val>\tSet PCI access parameter (see `-O help' for a list)\n" \
 	"-G\t\tEnable PCI access debugging\n" \
-	"-O <par>=<val>\tSet PCI access parameter (see `-O help' for a list)\n"
+	GENHELP_INTEL GENHELP_DUMP