--- kernel/bsd/net/if_ethersubr.c	2018/04/24 18:26:06	1.1.1.1
+++ kernel/bsd/net/if_ethersubr.c	2018/04/24 18:31:38	1.1.1.2
@@ -116,7 +116,7 @@ int BFIx;			/* 0 for Atalk; 1..9 for IP
 
 #include <net/ndrv.h>
 
-#if defined(LLC) && defined(CCITT)
+#if LLC && CCITT
 extern struct ifqueue pkintrq;
 #endif
 
@@ -497,7 +497,7 @@ ether_input(ifp, eh, m)
 
 #endif /* NS */
 	default:
-#if defined (ISO) || defined (LLC) || NETAT
+#if ISO || LLC || NETAT
 		if (etype > ETHERMTU)
 			goto dropanyway;
 		l = mtod(m, struct llc *);