Hotfix

[pciutils.git] / pciutils.h

diff --git a/pciutils.h b/pciutils.h
index 31a4ce1b2d25bdc445b9948d78c72293c78cc521..537de6f141c31b20e2f8c71d4ac60940520d3945 100644 (file)
--- a/pciutils.h
+++ b/pciutils.h
@@ -1,41 +1,40 @@
 /*
  *     The PCI Utilities -- Declarations
  *
- *     Copyright (c) 1997--2003 Martin Mares <mj@ucw.cz>
+ *     Copyright (c) 1997--2004 Martin Mares <mj@ucw.cz>
  *
  *     Can be freely distributed and used under the terms of the GNU GPL.
  */
 
 #include "lib/pci.h"
+#include "lib/sysdep.h"
 
-#define PCIUTILS_VERSION PCILIB_VERSION
-
-#if !defined(__GNUC__)
-#define NONRET
-#define inline
-#else
-#define NONRET __attribute__((noreturn))
+#ifdef PCI_OS_WINDOWS
+#include "compat/getopt.h"
 #endif
 
+#define PCIUTILS_VERSION PCILIB_VERSION
+
 void die(char *msg, ...) NONRET;
 void *xmalloc(unsigned int howmuch);
+void *xrealloc(void *ptr, unsigned int howmuch);
 int parse_generic_option(int i, struct pci_access *pacc, char *optarg);
 
-#ifdef HAVE_PM_LINUX_PROC
+#ifdef PCI_HAVE_PM_LINUX_PROC
 #define GENOPT_PROC "P:"
-#define GENHELP_PROC "-P <dir>\tUse specified directory instead of " PATH_PROC_BUS_PCI "\n"
+#define GENHELP_PROC "-P <dir>\tUse specified directory instead of " PCI_PATH_PROC_BUS_PCI "\n"
 #else
 #define GENOPT_PROC
 #define GENHELP_PROC
 #endif
-#ifdef HAVE_PM_INTEL_CONF
+#ifdef PCI_HAVE_PM_INTEL_CONF
 #define GENOPT_INTEL "H:"
 #define GENHELP_INTEL "-H <mode>\tUse direct hardware access (<mode> = 1 or 2)\n"
 #else
 #define GENOPT_INTEL
 #define GENHELP_INTEL
 #endif
-#ifdef HAVE_PM_DUMP
+#ifdef PCI_HAVE_PM_DUMP
 #define GENOPT_DUMP "F:"
 #define GENHELP_DUMP "-F <file>\tRead configuration data from given file\n"
 #else