The licence updates to xf86PciInfo.h haven't patched cleanly, and
are mis-commented, breaking the build. The attached patch fixes this.
--
xc/programs/Xserver/hw/xfree86/xf86cfg/config.h is also broken; it
includes the lines:
config.h
#include unistd.h
===
#ifdef sun
#undef index
#undef rindex
#include strings.h
#endif
#include unistd.h
1.20
I'm not clear which version we wish to keep.
--
Dr. Andrew C. Aitchison Computer Officer, DPMMS, Cambridge
[EMAIL PROTECTED] http://www.dpmms.cam.ac.uk/~werdna
Index: xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h
===
RCS file: /home/CVS/XFree86/xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h,v
retrieving revision 1.157
diff -u -r1.157 xf86PciInfo.h
--- xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h 2004/02/13 23:58:38 1.157
+++ xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h 2004/02/15 08:46:04
@@ -2,7 +2,7 @@
/*
* Copyright (c) 1995-2003 by The XFree86 Project, Inc.
- */
+ *
* All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining
@@ -46,6 +46,7 @@
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
/*
* This file contains macros for the PCI Vendor and Device IDs for video
