headers with no fixes applied, but still 'fixed'

Zack Weinberg zackw@stanford.edu
Wed May 9 18:38:00 GMT 2001


In my 3.0 branch build tree I have two "fixed" headers whose only
change is to add a huge label at the top:

--- /usr/include/linux/i2c.h  Sun May  6 13:21:19 2001
+++ linux/i2c.h       Wed May  9 18:08:33 2001
@@ -1,3 +1,12 @@
+/*  DO NOT EDIT THIS FILE.
+
+    It has been auto-edited by fixincludes from:
+
+       "/usr/include/linux/i2c.h"
+
+    This had to be done to correct non-standard usages in the
+    original, manufacturer supplied header file.  */
+
 /* ------------------------------------------------------------------------- */
 /*                                                                          */
 /* i2c.h - definitions for the i2c-bus interface                            */
--- /usr/include/kafs.h       Thu Mar 22 09:27:00 2001
+++ kafs.h    Wed May  9 18:08:44 2001
@@ -1,3 +1,12 @@
+/*  DO NOT EDIT THIS FILE.
+
+    It has been auto-edited by fixincludes from:
+
+       "/usr/include/kafs.h"
+
+    This had to be done to correct non-standard usages in the
+    original, manufacturer supplied header file.  */
+
 /*
  * Copyright (c) 1995, 1996, 1997, 1998, 1999 Kungliga Tekniska H<F6>gskolan
  * (Royal Institute of Technology, Stockholm, Sweden).

This seems to go with

Applying io_quotes_def            to linux/i2c.h
Fixed:  linux/i2c.h
Applying io_quotes_use            to kafs.h
Fixed:  kafs.h

i686-pc-linux-gnu (Debian 'unstable'); I can provide copies of i2c.h
and kafs.h on request.  i2c.h contains no actual ioctl macro
definitions; kafs.h does, but they're all in the modern style.

I notice that the io_quotes_* hacks are triggering on lots of Linux
kernel headers because of

#ifndef KERNEL_VERSION
#define KERNEL_VERSION(a,b,c) (((a) << 16) | ((b) << 8) | (c))
#endif

which matches the rather lenient regular expressions in the selection
patterns.  For speed, it'd be nice if we could tighten them up.
Unfortunately, I can't think of a way to write a regexp that matches
"[A-Z0-9_]+IO[A-Z]*\( but not [A-Z0-9_]+VERSION\(".

Any ideas on either issue?

-- 
zw      ...It's not easy for cognitive scientists to get grants if they
        are working on questions of any theoretical interest.  (To ensure
        this is a main function of the institution of peer review.)
        	-- Jerry Fodor, _The Mind Doesn't Work That Way_



More information about the Gcc-bugs mailing list