Fix to the previous patch.

[pciutils.git] / pciutils.h

diff --git a/pciutils.h b/pciutils.h
index d2233538716121d69fd18d6b6d0a0c4b417f4812..31a4ce1b2d25bdc445b9948d78c72293c78cc521 100644 (file)
--- a/pciutils.h
+++ b/pciutils.h
@@ -1,9 +1,7 @@
 /*
- *     $Id: pciutils.h,v 1.12 1999/01/22 21:04:59 mj Exp $
+ *     The PCI Utilities -- Declarations
  *
- *     Linux PCI Utilities -- Declarations
- *
- *     Copyright (c) 1997--1999 Martin Mares <mj@atrey.karlin.mff.cuni.cz>
+ *     Copyright (c) 1997--2003 Martin Mares <mj@ucw.cz>
  *
  *     Can be freely distributed and used under the terms of the GNU GPL.
  */
@@ -12,7 +10,14 @@
 
 #define PCIUTILS_VERSION PCILIB_VERSION
 
-void __attribute__((noreturn)) die(char *msg, ...);
+#if !defined(__GNUC__)
+#define NONRET
+#define inline
+#else
+#define NONRET __attribute__((noreturn))
+#endif
+
+void die(char *msg, ...) NONRET;
 void *xmalloc(unsigned int howmuch);
 int parse_generic_option(int i, struct pci_access *pacc, char *optarg);
 
@@ -30,13 +35,6 @@ int parse_generic_option(int i, struct pci_access *pacc, char *optarg);
 #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
 #define GENOPT_DUMP "F:"
 #define GENHELP_DUMP "-F <file>\tRead configuration data from given file\n"
@@ -45,6 +43,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"