d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Someone needs to teach Nate about the C pre-processor in general and the

Browse Source 
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.
This commit is contained in:
jkh 1996-12-23 01:24:44 +00:00
parent b4a9f746e1
commit ba341fe3e8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/i386/isa/if_ze.c
View File

@ -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"

4
sys/i386/isa/if_zp.c
View File

@ -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"