Hi! I started supping the -current kernel sources recently, and my build
yesterday wasn't completely successful. I got the following errors:

In file included from ../../../../arch/mac68k/dev/z8530tty.c:71:
locators.h:5: warning: `OBIO_NORMCF_NO' redefined
locators.h:4: warning: this is the location of the previous definition
locators.h:6: warning: `OBIO_NORMCF_NO' redefined
locators.h:5: warning: this is the location of the previous definition
locators.h:7: warning: `OBIO_NORMCF_NO' redefined
locators.h:6: warning: this is the location of the previous definition
*** Error code 1

Stop.

Now, I checked out the file in question, and saw something odd:

extern const char *obio_normcf_locnames[];
#define OBIO_NORMCF_ADDR 0
#define OBIO_NORMCF_ADDR_DEFAULT -1
#define OBIO_NORMCF_NO DRQ 1
#define OBIO_NORMCF_NO DRQ_DEFAULT -1
#define OBIO_NORMCF_NO HSK 2
#define OBIO_NORMCF_NO HSK_DEFAULT -1

Either I've been out of touch for a while, or for some off reason there are
underscores missing. I backed up the original file, and added underscores
as I thought appropriate...

#define OBIO_NORMCF_NO_DRQ 1
#define OBIO_NORMCF_NO_DRQ_DEFAULT -1
#define OBIO_NORMCF_NO_HSK 2
#define OBIO_NORMCF_NO_HSK_DEFAULT -1

This seems to be what was intended, I'm guessing. Also, it sort of matches
the definitions I found below the questionable #defines.

So, anyway, did I do the right thing? If so, should someone fix this in the
online source? Or is there some concept I've missed?

Thanks in advance for the information.

--
        Mason Loring Bliss    /\    mason@acheron.middleboro.ma.us
      PGPKeyID: 0x25B3D5B5   /()\   awake ? sleep() : dream();
<barbaric>YAWP!</barbaric>  /    \  http://genesis.tiac.net/~mason