summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorguenther <guenther@openbsd.org>2014-03-11 19:45:27 +0000
committerguenther <guenther@openbsd.org>2014-03-11 19:45:27 +0000
commit87f48f4827a9e414651e79922690f65b6bb6e7d1 (patch)
tree63f85c9521871ab641f88e622390618624a58fa4
parentFor CA generation, go back to using a two-step procedure to create a CSR and (diff)
downloadwireguard-openbsd-87f48f4827a9e414651e79922690f65b6bb6e7d1.tar.xz
wireguard-openbsd-87f48f4827a9e414651e79922690f65b6bb6e7d1.zip
lint is gone, and the 'lint' conditional was never in the implementation
namespace, so stop changing behavior when it's #defined ok beck@ krw@
-rw-r--r--sys/arch/alpha/include/stdarg.h7
-rw-r--r--sys/arch/amd64/include/stdarg.h9
-rw-r--r--sys/arch/hp300/dev/dca.c6
-rw-r--r--sys/arch/hppa/include/stdarg.h7
-rw-r--r--sys/arch/hppa64/include/stdarg.h7
-rw-r--r--sys/arch/i386/include/stdarg.h7
-rw-r--r--sys/arch/ia64/include/stdarg.h9
-rw-r--r--sys/arch/m68k/include/stdarg.h6
-rw-r--r--sys/arch/mips64/include/endian.h4
-rw-r--r--sys/arch/sparc/include/stdarg.h10
-rw-r--r--sys/arch/sparc64/include/stdarg.h13
-rw-r--r--sys/arch/vax/include/intr.h4
-rw-r--r--sys/arch/vax/include/macros.h4
-rw-r--r--sys/arch/vax/include/stdarg.h10
-rw-r--r--sys/dev/ic/rt2661.c4
-rw-r--r--sys/kern/tty_conf.c7
-rw-r--r--sys/kern/uipc_domain.c4
-rw-r--r--sys/netinet/tcp_debug.c4
-rw-r--r--sys/sys/cdefs.h16
-rw-r--r--sys/sys/types.h4
20 files changed, 30 insertions, 112 deletions
diff --git a/sys/arch/alpha/include/stdarg.h b/sys/arch/alpha/include/stdarg.h
index 218a0d09aec..f0449618ff4 100644
--- a/sys/arch/alpha/include/stdarg.h
+++ b/sys/arch/alpha/include/stdarg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: stdarg.h,v 1.13 2011/03/23 16:54:34 pirofti Exp $ */
+/* $OpenBSD: stdarg.h,v 1.14 2014/03/11 19:45:27 guenther Exp $ */
/* $NetBSD: stdarg.h,v 1.4 1996/10/09 21:13:05 cgd Exp $ */
/*-
@@ -43,13 +43,8 @@ typedef __va_list va_list;
#define __va_size(type) \
(((sizeof(type) + sizeof(long) - 1) / sizeof(long)) * sizeof(long))
-#ifdef lint
-#define va_start(ap,lastarg) ((ap) = (ap))
-#define __va_copy(dst, src) ((dst) = (src))
-#else
#define va_start(ap, last) \
(__builtin_next_arg(last), (ap) = *(va_list *)__builtin_saveregs(), (ap).pad = 0)
-#endif /* lint */
#define __REAL_TYPE_CLASS 8
#define __va_arg_offset(ap, type) \
diff --git a/sys/arch/amd64/include/stdarg.h b/sys/arch/amd64/include/stdarg.h
index cfffc33e2a9..aa35064b853 100644
--- a/sys/arch/amd64/include/stdarg.h
+++ b/sys/arch/amd64/include/stdarg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: stdarg.h,v 1.8 2011/03/23 16:54:34 pirofti Exp $ */
+/* $OpenBSD: stdarg.h,v 1.9 2014/03/11 19:45:27 guenther Exp $ */
/* $NetBSD: stdarg.h,v 1.2 2003/04/28 23:16:17 bjh21 Exp $ */
/*-
@@ -39,7 +39,7 @@
#include <machine/_types.h> /* for __va_list */
/*
- * NOTE: this file is only used by lint and non-GNU compilers
+ * NOTE: this file is only used by non-GNU compilers
*/
typedef __va_list va_list;
@@ -47,13 +47,8 @@ typedef __va_list va_list;
#define __va_size(type) \
(((sizeof(type) + sizeof(long) - 1) / sizeof(long)) * sizeof(long))
-#ifdef lint
-#define va_start(ap,lastarg) ((ap) = (ap))
-#define __va_copy(dst, src) ((dst) = (src))
-#else
#define va_start(ap, last) \
((ap) = (va_list)&(last) + __va_size(last))
-#endif /* lint */
#define va_arg(ap, type) \
(*(type *)((ap) += __va_size(type), (ap) - __va_size(type)))
diff --git a/sys/arch/hp300/dev/dca.c b/sys/arch/hp300/dev/dca.c
index db911e451bc..7653fa6a7a8 100644
--- a/sys/arch/hp300/dev/dca.c
+++ b/sys/arch/hp300/dev/dca.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dca.c,v 1.43 2013/08/04 07:21:12 martin Exp $ */
+/* $OpenBSD: dca.c,v 1.44 2014/03/11 19:45:27 guenther Exp $ */
/* $NetBSD: dca.c,v 1.35 1997/05/05 20:58:18 thorpej Exp $ */
/*
@@ -1095,10 +1095,6 @@ dcacnputc(dev, c)
u_char stat;
int s = splhigh();
-#ifdef lint
- stat = dev; if (stat) return;
-#endif
-
if (dcaconsinit == 0) {
dcainit(dca_cn, dcadefaultrate);
dcaconsinit = 1;
diff --git a/sys/arch/hppa/include/stdarg.h b/sys/arch/hppa/include/stdarg.h
index 9587297195e..dfb118039a9 100644
--- a/sys/arch/hppa/include/stdarg.h
+++ b/sys/arch/hppa/include/stdarg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: stdarg.h,v 1.10 2010/12/30 05:01:36 tedu Exp $ */
+/* $OpenBSD: stdarg.h,v 1.11 2014/03/11 19:45:27 guenther Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -39,12 +39,7 @@
typedef __va_list va_list;
-#ifdef lint
-#define va_start(ap,lastarg) ((ap) = (ap))
-#define __va_copy(dst, src) ((dst) = (src))
-#else
#define va_start(ap,lastarg) ((ap) = (va_list)__builtin_saveregs())
-#endif /* lint */
#define va_arg(ap,type) \
(sizeof(type) > 8 ? \
diff --git a/sys/arch/hppa64/include/stdarg.h b/sys/arch/hppa64/include/stdarg.h
index 1282b18740b..b4e6f24d1cf 100644
--- a/sys/arch/hppa64/include/stdarg.h
+++ b/sys/arch/hppa64/include/stdarg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: stdarg.h,v 1.7 2010/12/30 05:01:36 tedu Exp $ */
+/* $OpenBSD: stdarg.h,v 1.8 2014/03/11 19:45:27 guenther Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -39,12 +39,7 @@
typedef __va_list va_list;
-#ifdef lint
-#define va_start(ap,lastarg) ((ap) = (ap))
-#define __va_copy(dst, src) ((dst) = (src))
-#else
#define va_start(ap,lastarg) ((ap) = (va_list)__builtin_saveregs())
-#endif /* lint */
#define va_arg(ap,type) \
(sizeof(type) > 8 ? \
diff --git a/sys/arch/i386/include/stdarg.h b/sys/arch/i386/include/stdarg.h
index b752bbabce6..e242591dd67 100644
--- a/sys/arch/i386/include/stdarg.h
+++ b/sys/arch/i386/include/stdarg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: stdarg.h,v 1.15 2011/03/23 16:54:35 pirofti Exp $ */
+/* $OpenBSD: stdarg.h,v 1.16 2014/03/11 19:45:27 guenther Exp $ */
/* $NetBSD: stdarg.h,v 1.12 1995/12/25 23:15:31 mycroft Exp $ */
/*-
@@ -43,13 +43,8 @@ typedef __va_list va_list;
#define __va_size(type) \
(((sizeof(type) + sizeof(long) - 1) / sizeof(long)) * sizeof(long))
-#ifdef lint
-#define va_start(ap,lastarg) ((ap) = (ap))
-#define __va_copy(dst, src) ((dst) = (src))
-#else
#define va_start(ap, last) \
((ap) = (va_list)__builtin_next_arg(last))
-#endif /* lint */
#define va_arg(ap, type) \
(*(type *)((ap) += __va_size(type), (ap) - __va_size(type)))
diff --git a/sys/arch/ia64/include/stdarg.h b/sys/arch/ia64/include/stdarg.h
index 2d05090e89e..754d2a23823 100644
--- a/sys/arch/ia64/include/stdarg.h
+++ b/sys/arch/ia64/include/stdarg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: stdarg.h,v 1.1 2011/07/04 23:29:08 pirofti Exp $ */
+/* $OpenBSD: stdarg.h,v 1.2 2014/03/11 19:45:27 guenther Exp $ */
/* $NetBSD: stdarg.h,v 1.2 2003/04/28 23:16:17 bjh21 Exp $ */
/*-
@@ -39,7 +39,7 @@
#include <machine/_types.h> /* for __va_list */
/*
- * NOTE: this file is only used by lint and non-GNU compilers
+ * NOTE: this file is only used by non-GNU compilers
*/
typedef __va_list va_list;
@@ -47,13 +47,8 @@ typedef __va_list va_list;
#define __va_size(type) \
(((sizeof(type) + sizeof(long) - 1) / sizeof(long)) * sizeof(long))
-#ifdef lint
-#define va_start(ap,lastarg) ((ap) = (ap))
-#define __va_copy(dst, src) ((dst) = (src))
-#else
#define va_start(ap, last) \
((ap) = (va_list)&(last) + __va_size(last))
-#endif /* lint */
#define va_arg(ap, type) \
(*(type *)((ap) += __va_size(type), (ap) - __va_size(type)))
diff --git a/sys/arch/m68k/include/stdarg.h b/sys/arch/m68k/include/stdarg.h
index bde1c366e3c..3a44a425b42 100644
--- a/sys/arch/m68k/include/stdarg.h
+++ b/sys/arch/m68k/include/stdarg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: stdarg.h,v 1.11 2008/10/23 21:25:07 kettenis Exp $ */
+/* $OpenBSD: stdarg.h,v 1.12 2014/03/11 19:45:27 guenther Exp $ */
/* $NetBSD: stdarg.h,v 1.14 1995/12/25 23:15:33 mycroft Exp $ */
/*-
@@ -43,12 +43,8 @@ typedef __va_list va_list;
#define __va_size(type) \
(((sizeof(type) + sizeof(long) - 1) / sizeof(long)) * sizeof(long))
-#ifdef lint
-#define va_start(ap,lastarg) ((ap) = (ap))
-#else
#define va_start(ap, last) \
((ap) = (va_list)__builtin_next_arg(last))
-#endif /* lint */
#define va_arg(ap, type) \
(*(type *)((ap) += __va_size(type), \
diff --git a/sys/arch/mips64/include/endian.h b/sys/arch/mips64/include/endian.h
index 71d0554ec60..c8ecfde3bfc 100644
--- a/sys/arch/mips64/include/endian.h
+++ b/sys/arch/mips64/include/endian.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: endian.h,v 1.7 2011/03/23 16:54:36 pirofti Exp $ */
+/* $OpenBSD: endian.h,v 1.8 2014/03/11 19:45:27 guenther Exp $ */
/*
* Copyright (c) 2001-2002 Opsycon AB (www.opsycon.se / www.opsycon.com)
@@ -36,7 +36,7 @@
#define _BYTE_ORDER _BIG_ENDIAN
#endif
-#if !defined(_BYTE_ORDER) && !defined(lint)
+#if !defined(_BYTE_ORDER)
#error "__MIPSEL__ or __MIPSEB__ must be defined to define BYTE_ORDER!!!"
#endif
diff --git a/sys/arch/sparc/include/stdarg.h b/sys/arch/sparc/include/stdarg.h
index 86aed57f62b..e7af102c81c 100644
--- a/sys/arch/sparc/include/stdarg.h
+++ b/sys/arch/sparc/include/stdarg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: stdarg.h,v 1.15 2011/03/23 16:54:37 pirofti Exp $ */
+/* $OpenBSD: stdarg.h,v 1.16 2014/03/11 19:45:27 guenther Exp $ */
/* $NetBSD: stdarg.h,v 1.10 1996/12/27 20:55:28 pk Exp $ */
/*
@@ -47,21 +47,13 @@
#include <sys/cdefs.h>
#include <machine/_types.h>
-#ifdef __lint__
-#define __builtin_classify_type(t) (0)
-#endif
-
typedef __va_list va_list;
#define __va_size(type) \
(((sizeof(type) + sizeof(long) - 1) / sizeof(long)) * sizeof(long))
-#ifdef lint
-#define va_start(ap,lastarg) ((ap) = (ap))
-#else
#define va_start(ap, last) \
(__builtin_next_arg(last), (ap) = (va_list)__builtin_saveregs())
-#endif /* lint */
/*
* va_arg picks up the next argument of type `type'. Appending an
diff --git a/sys/arch/sparc64/include/stdarg.h b/sys/arch/sparc64/include/stdarg.h
index 9bd7855ce28..d69e93b6054 100644
--- a/sys/arch/sparc64/include/stdarg.h
+++ b/sys/arch/sparc64/include/stdarg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: stdarg.h,v 1.9 2011/03/23 16:54:37 pirofti Exp $ */
+/* $OpenBSD: stdarg.h,v 1.10 2014/03/11 19:45:27 guenther Exp $ */
/* $NetBSD: stdarg.h,v 1.11 2000/07/23 21:36:56 mycroft Exp $ */
/*
@@ -47,21 +47,10 @@
#include <sys/cdefs.h>
#include <machine/_types.h>
-#ifdef __lint__
-#define __builtin_saveregs(t) (0)
-#define __builtin_classify_type(t) (0)
-#define __builtin_next_arg(t) ((t) ? 0 : 0)
-#endif
-
typedef __va_list va_list;
-#ifdef lint
-#define va_start(ap,lastarg) ((ap) = (ap))
-#define __va_copy(dst, src) ((dst) = (src))
-#else
#define va_start(ap, last) \
(__builtin_next_arg(last), (ap) = (va_list)__builtin_saveregs())
-#endif /* lint */
#define va_end(ap)
diff --git a/sys/arch/vax/include/intr.h b/sys/arch/vax/include/intr.h
index 38eea015f52..3075ff43e39 100644
--- a/sys/arch/vax/include/intr.h
+++ b/sys/arch/vax/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.16 2013/05/17 19:38:52 kettenis Exp $ */
+/* $OpenBSD: intr.h,v 1.17 2014/03/11 19:45:27 guenther Exp $ */
/* $NetBSD: intr.h,v 1.1 1998/08/18 23:55:00 matt Exp $ */
/*
@@ -60,7 +60,6 @@
#define IST_EDGE 2 /* edge-triggered */
#define IST_LEVEL 3 /* level-triggered */
-#ifndef lint
#define _splset(reg) \
({ \
register int val; \
@@ -86,7 +85,6 @@
#define splx(reg) \
__asm __volatile ("mtpr %0,$0x12" : : "g" (reg))
-#endif
#define spl0() _splset(IPL_NONE)
#define splsoftclock() _splraise(IPL_SOFTCLOCK)
diff --git a/sys/arch/vax/include/macros.h b/sys/arch/vax/include/macros.h
index 5040acdd4b8..bbf0f2475df 100644
--- a/sys/arch/vax/include/macros.h
+++ b/sys/arch/vax/include/macros.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: macros.h,v 1.20 2013/07/05 21:10:50 miod Exp $ */
+/* $OpenBSD: macros.h,v 1.21 2014/03/11 19:45:27 guenther Exp $ */
/* $NetBSD: macros.h,v 1.20 2000/07/19 01:02:52 matt Exp $ */
/*
@@ -33,7 +33,7 @@
/* All bugs are subject to removal without further notice */
-#if !defined(_MACHINE_MACROS_H_) && !defined(lint)
+#ifndef _MACHINE_MACROS_H_
#define _MACHINE_MACROS_H_
/* Here general macros are supposed to be stored */
diff --git a/sys/arch/vax/include/stdarg.h b/sys/arch/vax/include/stdarg.h
index 2f55b8a9398..5616d3881f5 100644
--- a/sys/arch/vax/include/stdarg.h
+++ b/sys/arch/vax/include/stdarg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: stdarg.h,v 1.11 2011/03/23 16:54:37 pirofti Exp $ */
+/* $OpenBSD: stdarg.h,v 1.12 2014/03/11 19:45:27 guenther Exp $ */
/* $NetBSD: stdarg.h,v 1.11 1999/05/03 16:30:34 christos Exp $ */
/*-
@@ -40,19 +40,11 @@
typedef __va_list va_list;
-#ifdef __lint__
-#define __builtin_next_arg(t) ((t) ? 0 : 0)
-#endif
-
#define __va_size(type) \
(((sizeof(type) + sizeof(long) - 1) / sizeof(long)) * sizeof(long))
-#ifdef lint
-#define va_start(ap,lastarg) ((ap) = (ap))
-#else
#define va_start(ap, last) \
((ap) = (va_list)__builtin_next_arg(last))
-#endif /* lint */
#define va_arg(ap, type) \
(*(type *)(void *)((ap) += __va_size(type), (ap) - __va_size(type)))
diff --git a/sys/dev/ic/rt2661.c b/sys/dev/ic/rt2661.c
index e154f461c85..393b84cadb5 100644
--- a/sys/dev/ic/rt2661.c
+++ b/sys/dev/ic/rt2661.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rt2661.c,v 1.70 2013/12/06 21:03:03 deraadt Exp $ */
+/* $OpenBSD: rt2661.c,v 1.71 2014/03/11 19:45:28 guenther Exp $ */
/*-
* Copyright (c) 2006
@@ -273,7 +273,7 @@ rt2661_attachhook(void *xsc)
struct rt2661_softc *sc = xsc;
struct ieee80211com *ic = &sc->sc_ic;
struct ifnet *ifp = &ic->ic_if;
- const char *name = NULL; /* make lint happy */
+ const char *name = NULL;
int i, error;
switch (sc->sc_id) {
diff --git a/sys/kern/tty_conf.c b/sys/kern/tty_conf.c
index f63ef7e6d2d..a6066823afc 100644
--- a/sys/kern/tty_conf.c
+++ b/sys/kern/tty_conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tty_conf.c,v 1.17 2013/12/13 19:55:12 naddy Exp $ */
+/* $OpenBSD: tty_conf.c,v 1.18 2014/03/11 19:45:28 guenther Exp $ */
/* $NetBSD: tty_conf.c,v 1.18 1996/05/19 17:17:55 jonathan Exp $ */
/*-
@@ -162,13 +162,8 @@ int nlinesw = sizeof (linesw) / sizeof (linesw[0]);
* Do nothing specific version of line
* discipline specific ioctl command.
*/
-/*ARGSUSED*/
int
nullioctl(struct tty *tp, u_long cmd, char *data, int flags, struct proc *p)
{
-
-#ifdef lint
- tp = tp; data = data; flags = flags; p = p;
-#endif
return (-1);
}
diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c
index 1be2d180fae..1095103c7c7 100644
--- a/sys/kern/uipc_domain.c
+++ b/sys/kern/uipc_domain.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uipc_domain.c,v 1.34 2014/01/19 03:04:54 claudio Exp $ */
+/* $OpenBSD: uipc_domain.c,v 1.35 2014/03/11 19:45:28 guenther Exp $ */
/* $NetBSD: uipc_domain.c,v 1.14 1996/02/09 19:00:44 christos Exp $ */
/*
@@ -78,7 +78,6 @@ domaininit(void)
* KAME NOTE: ADDDOMAIN(route) is moved to the last part so that
* it will be initialized as the *first* element. confusing!
*/
-#ifndef lint
ADDDOMAIN(unix);
#ifdef INET
ADDDOMAIN(inet);
@@ -101,7 +100,6 @@ domaininit(void)
ADDDOMAIN(bt);
#endif
ADDDOMAIN(route);
-#endif
for (dp = domains; dp; dp = dp->dom_next) {
if (dp->dom_init)
diff --git a/sys/netinet/tcp_debug.c b/sys/netinet/tcp_debug.c
index d5e9b3f0468..145cf9c449b 100644
--- a/sys/netinet/tcp_debug.c
+++ b/sys/netinet/tcp_debug.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcp_debug.c,v 1.20 2004/09/24 15:02:43 markus Exp $ */
+/* $OpenBSD: tcp_debug.c,v 1.21 2014/03/11 19:45:28 guenther Exp $ */
/* $NetBSD: tcp_debug.c,v 1.10 1996/02/13 23:43:36 christos Exp $ */
/*
@@ -191,11 +191,9 @@ tcp_trace(short act, short ostate, struct tcpcb *tp, caddr_t headers,
printf("@%x, urp=%x", ack, th->th_urp);
flags = th->th_flags;
if (flags) {
-#ifndef lint
char *cp = "<";
#define pf(f) { if (th->th_flags&TH_##f) { printf("%s%s", cp, "f"); cp = ","; } }
pf(SYN); pf(ACK); pf(FIN); pf(RST); pf(PUSH); pf(URG);
-#endif
printf(">");
}
break;
diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h
index 95af3e405c6..382183dd0de 100644
--- a/sys/sys/cdefs.h
+++ b/sys/sys/cdefs.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cdefs.h,v 1.34 2012/08/14 20:11:37 matthew Exp $ */
+/* $OpenBSD: cdefs.h,v 1.35 2014/03/11 19:45:28 guenther Exp $ */
/* $NetBSD: cdefs.h,v 1.16 1996/04/03 20:46:39 christos Exp $ */
/*
@@ -69,9 +69,9 @@
#if defined(__cplusplus) || defined(__PCC__)
#define __inline inline /* convert to C++ keyword */
#else
-#if !defined(__GNUC__) && !defined(lint)
+#if !defined(__GNUC__)
#define __inline /* delete GCC keyword */
-#endif /* !__GNUC__ && !lint */
+#endif /* !__GNUC__ */
#endif /* !__cplusplus */
#else /* !(__STDC__ || __cplusplus) */
@@ -79,12 +79,12 @@
#define __CONCAT(x,y) x/**/y
#define __STRING(x) "x"
-#if !defined(__GNUC__) && !defined(lint)
+#if !defined(__GNUC__)
#define __const /* delete pseudo-ANSI C keywords */
#define __inline
#define __signed
#define __volatile
-#endif /* !__GNUC__ && !lint */
+#endif /* !__GNUC__ */
/*
* In non-ANSI C environments, new programs will want ANSI-only C keywords
@@ -114,8 +114,6 @@
#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
#define __dead __volatile
#define __pure __const
-#elif defined(lint)
-#define __dead /* NORETURN */
#endif
#elif !defined(__STRICT_ANSI__)
#define __dead __attribute__((__noreturn__))
@@ -207,8 +205,6 @@
#if __GNUC_PREREQ__(2, 7) || defined(__PCC__)
#define __packed __attribute__((__packed__))
-#elif defined(lint)
-#define __packed
#endif
#if !__GNUC_PREREQ__(2, 8)
@@ -217,8 +213,6 @@
#if __GNUC_PREREQ__(2, 8) || defined(__PCC__)
#define __statement(x) __extension__(x)
-#elif defined(lint)
-#define __statement(x) (0)
#else
#define __statement(x) (x)
#endif
diff --git a/sys/sys/types.h b/sys/sys/types.h
index f3a210c56de..f3a0e73505f 100644
--- a/sys/sys/types.h
+++ b/sys/sys/types.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: types.h,v 1.39 2013/09/14 01:35:02 guenther Exp $ */
+/* $OpenBSD: types.h,v 1.40 2014/03/11 19:45:28 guenther Exp $ */
/* $NetBSD: types.h,v 1.29 1996/11/15 22:48:25 jtc Exp $ */
/*-
@@ -241,7 +241,7 @@ struct uio;
#endif
#ifdef _KERNEL
-#if (defined(__GNUC__) && __GNUC__ >= 3) || defined(__PCC__) || defined(lint)
+#if (defined(__GNUC__) && __GNUC__ >= 3) || defined(__PCC__)
/* Support for _C99: type _Bool is already built-in. */
#define false 0
#define true 1