Hotfix

[pciutils.git] / pciutils.h

diff --git a/pciutils.h b/pciutils.h
index cb958cd8b9ba5b844f08624638c95b06d2e782a1..537de6f141c31b20e2f8c71d4ac60940520d3945 100644 (file)
--- a/pciutils.h
+++ b/pciutils.h
@@ -1,48 +1,40 @@
 /*
- *     $Id: pciutils.h,v 1.14 2002/03/30 15:39:24 mj Exp $
+ *     The PCI Utilities -- Declarations
  *
- *     Linux PCI Utilities -- Declarations
- *
- *     Copyright (c) 1997--1999 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 __attribute__(x)
-#define inline
+#ifdef PCI_OS_WINDOWS
+#include "compat/getopt.h"
 #endif
 
-void __attribute__((noreturn)) die(char *msg, ...);
+#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_SYSCALLS
-#define GENOPT_SYSCALLS "S"
-#define GENHELP_SYSCALLS "-S\t\tUse direct hardware access via syscalls\n"
-#else
-#define GENOPT_SYSCALLS
-#define GENHELP_SYSCALLS
-#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
@@ -50,6 +42,6 @@ int parse_generic_option(int i, struct pci_access *pacc, char *optarg);
 #define GENHELP_DUMP
 #endif
 
-#define GENERIC_OPTIONS "G" GENOPT_PROC GENOPT_INTEL GENOPT_SYSCALLS GENOPT_DUMP
-#define GENERIC_HELP GENHELP_PROC GENHELP_INTEL GENHELP_SYSCALLS GENHELP_DUMP \
+#define GENERIC_OPTIONS "G" GENOPT_PROC GENOPT_INTEL GENOPT_DUMP
+#define GENERIC_HELP GENHELP_PROC GENHELP_INTEL GENHELP_DUMP \
        "-G\t\tEnable PCI access debugging\n"