diff options
| author | jkh <jkh@FreeBSD.org> | 1996-12-23 01:24:44 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1996-12-23 01:24:44 +0000 |
| commit | ba341fe3e82d8de79a6008e6a18c06798a167d2e (patch) | |
| tree | 632e9dcbdff415414f0dd8a39b04ceeb7c8dd5ab /sys/i386/isa | |
| parent | b4a9f746e1092d0b3ff1ce8b779c239252def21a (diff) | |
| download | FreeBSD-src-ba341fe3e82d8de79a6008e6a18c06798a167d2e.zip FreeBSD-src-ba341fe3e82d8de79a6008e6a18c06798a167d2e.tar.gz | |
Someone needs to teach Nate about the C pre-processor in general and the
workings of #error in particular. He also broke the 2.2 build with this
change, leading me to wonder whether or not the changes were ever even
tested. Folks, I'm happy to see people work directly on 2.2 like
this and will continue to encourage Nate to make direct commits, but
please TEST before committing! I think that's a more than reasonable
prerequisite, and this code could never have worked at all, leading me to
believe that Nate skipped this most basic of steps.
Diffstat (limited to 'sys/i386/isa')
| -rw-r--r-- | sys/i386/isa/if_ze.c | 4 | ||||
| -rw-r--r-- | sys/i386/isa/if_zp.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/i386/isa/if_ze.c b/sys/i386/isa/if_ze.c index 9f9951c..5e76af7 100644 --- a/sys/i386/isa/if_ze.c +++ b/sys/i386/isa/if_ze.c @@ -47,14 +47,14 @@ */ /* - * $Id: if_ze.c,v 1.34 1996/12/13 21:28:24 wollman Exp $ + * $Id: if_ze.c,v 1.35 1996/12/21 17:53:38 nate Exp $ */ /* XXX - Don't mix different PCCARD support code */ #include "pcic.h" #include "crd.h" #if NCRD > 0 || NPCIC > 0 -#error Dedicated PCMCIA drivers and generic PCMCIA support can't be mixed +#error "Dedicated PCMCIA drivers and generic PCMCIA support can't be mixed" #endif #include "ze.h" diff --git a/sys/i386/isa/if_zp.c b/sys/i386/isa/if_zp.c index d649bcc..63a43ae 100644 --- a/sys/i386/isa/if_zp.c +++ b/sys/i386/isa/if_zp.c @@ -34,7 +34,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * From: if_ep.c,v 1.9 1994/01/25 10:46:29 deraadt Exp $ - * $Id: if_zp.c,v 1.28 1996/12/13 21:28:25 wollman Exp $ + * $Id: if_zp.c,v 1.29 1996/12/21 17:53:39 nate Exp $ */ /*- * TODO: @@ -104,7 +104,7 @@ #include "pcic.h" #include "crd.h" #if NCRD > 0 || NPCIC > 0 -#error Dedicated PCMCIA drivers and generic PCMCIA support can't be mixed +#error "Dedicated PCMCIA drivers and generic PCMCIA support can't be mixed" #endif #include "zp.h" |
