HAVE_OWN_HEADER_H is gone.

diff --git a/lib/configure b/lib/configure
index b5f9fadbe285116fcdf5342fc354c24418203506..f58c223ea2361e69abf9115253f5362e2e7b8878 100755 (executable)
--- a/lib/configure
+++ b/lib/configure
@@ -87,8 +87,5 @@ if [ -z "$ok" ] ; then
        echo "WARNING: No real configuration access method is available."
 fi
 echo >>$c "#define PATH_PCI_IDS \"$prefix/share/pci.ids\""
        echo "WARNING: No real configuration access method is available."
 fi
 echo >>$c "#define PATH_PCI_IDS \"$prefix/share/pci.ids\""

-if [ -f header.h ] ; then
-       echo >>$c '#define HAVE_OWN_HEADER_H'
-fi

 echo >>$c "#define PCILIB_VERSION \"$version\""
 sed '/^#define [^ ]*$/!d;s/^#define \(.*\)/\1=1/' <$c >config.mk
 echo >>$c "#define PCILIB_VERSION \"$version\""
 sed '/^#define [^ ]*$/!d;s/^#define \(.*\)/\1=1/' <$c >config.mk

diff --git a/lib/pci.h b/lib/pci.h
index bea893cf3bdcc8fa62378b325ee746b2297e8c69..560e720749cc273a2e1f45e2e44a8841bd408ad6 100644 (file)
--- a/lib/pci.h
+++ b/lib/pci.h
@@ -1,9 +1,9 @@
 /*
 /*

- *     $Id: pci.h,v 1.10 2002/12/26 19:28:33 mj Exp $
+ *     $Id: pci.h,v 1.11 2002/12/26 20:24:32 mj Exp $

  *
  *     The PCI Library
  *
  *
  *     The PCI Library
  *

- *     Copyright (c) 1997--1999 Martin Mares <mj@ucw.cz>
+ *     Copyright (c) 1997--2002 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.
  */


@@ -12,12 +12,7 @@
 #define _PCI_LIB_H
 
 #include "config.h"
 #define _PCI_LIB_H
 
 #include "config.h"

-
-#ifdef HAVE_OWN_HEADER_H

 #include "header.h"
 #include "header.h"

-#else
-#include <linux/pci.h>
-#endif

 
 /*
  *     Types
 
 /*
  *     Types