summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2001-07-04 23:14:57 +0000
committerMarc Espie <espie@cvs.openbsd.org>2001-07-04 23:14:57 +0000
commit2ede71b20e42d2f74d0298d6358b37726dc3dc67 (patch)
tree0124ebbc6d29caf69d8f0f322244747e5e5cb461 /sys
parent3c3c8e0b30db1bf4ef13d732ae4521e855b1a235 (diff)
Make preprocessor happier, don't give it untasty tokens at end of input.
Ok millert@
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/i386/isa/pccom.c4
-rw-r--r--sys/ddb/db_output.c4
-rw-r--r--sys/ddb/db_run.c6
-rw-r--r--sys/net/if_loop.c6
-rw-r--r--sys/netinet/ip_esp.h4
-rw-r--r--sys/netinet/ip_ipip.c4
-rw-r--r--sys/netinet/tcp_input.c4
7 files changed, 16 insertions, 16 deletions
diff --git a/sys/arch/i386/isa/pccom.c b/sys/arch/i386/isa/pccom.c
index f7e45527924..e4f048e8fc7 100644
--- a/sys/arch/i386/isa/pccom.c
+++ b/sys/arch/i386/isa/pccom.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pccom.c,v 1.37 2001/03/15 17:52:20 deraadt Exp $ */
+/* $OpenBSD: pccom.c,v 1.38 2001/07/04 23:14:51 espie Exp $ */
/* $NetBSD: com.c,v 1.82.4.1 1996/06/02 09:08:00 mrg Exp $ */
/*
@@ -226,7 +226,7 @@ comspeed(freq, speed)
return -1;
return x;
-#undef divrnd(n, q)
+#undef divrnd
}
int
diff --git a/sys/ddb/db_output.c b/sys/ddb/db_output.c
index 84bb1132255..75f4e276d3e 100644
--- a/sys/ddb/db_output.c
+++ b/sys/ddb/db_output.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_output.c,v 1.14 1997/11/04 20:45:15 chuck Exp $ */
+/* $OpenBSD: db_output.c,v 1.15 2001/07/04 23:14:53 espie Exp $ */
/* $NetBSD: db_output.c,v 1.13 1996/04/01 17:27:14 christos Exp $ */
/*
@@ -66,7 +66,7 @@
#ifndef DB_MAX_LINE
#define DB_MAX_LINE 24 /* maximum line */
#define DB_MAX_WIDTH 80 /* maximum width */
-#endif DB_MAX_LINE
+#endif /* DB_MAX_LINE */
#define DB_MIN_MAX_WIDTH 20 /* minimum max width */
#define DB_MIN_MAX_LINE 3 /* minimum max line */
diff --git a/sys/ddb/db_run.c b/sys/ddb/db_run.c
index be4316515b4..8cd3a4545cd 100644
--- a/sys/ddb/db_run.c
+++ b/sys/ddb/db_run.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_run.c,v 1.13 2001/01/24 09:38:03 hugh Exp $ */
+/* $OpenBSD: db_run.c,v 1.14 2001/07/04 23:14:53 espie Exp $ */
/* $NetBSD: db_run.c,v 1.8 1996/02/05 01:57:12 christos Exp $ */
/*
@@ -210,7 +210,7 @@ db_restart_at_pc(regs, watchpt)
db_load_count += inst_load(ins);
db_store_count += inst_store(ins);
}
-#endif SOFTWARE_SSTEP
+#endif /* SOFTWARE_SSTEP */
}
if (db_run_mode == STEP_CONTINUE) {
@@ -410,4 +410,4 @@ db_clear_single_step(regs)
}
}
-#endif SOFTWARE_SSTEP
+#endif /* SOFTWARE_SSTEP */
diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c
index 9c6d22d4014..ab0f2d67772 100644
--- a/sys/net/if_loop.c
+++ b/sys/net/if_loop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_loop.c,v 1.19 2001/06/27 06:07:42 kjc Exp $ */
+/* $OpenBSD: if_loop.c,v 1.20 2001/07/04 23:14:54 espie Exp $ */
/* $NetBSD: if_loop.c,v 1.15 1996/05/07 02:40:33 thorpej Exp $ */
/*
@@ -297,7 +297,7 @@ looutput(ifp, m, dst, rt)
ifq = &atintrq2;
isr = NETISR_ATALK;
break;
-#endif NETATALK
+#endif /* NETATALK */
default:
printf("%s: can't handle af%d\n", ifp->if_xname,
dst->sa_family);
@@ -377,7 +377,7 @@ lo_altqstart(ifp)
ifq = &atintrq2;
isr = NETISR_ATALK;
break;
-#endif NETATALK
+#endif /* NETATALK */
default:
printf("lo_altqstart: can't handle af%d\n", af);
m_freem(m);
diff --git a/sys/netinet/ip_esp.h b/sys/netinet/ip_esp.h
index f6dafae808f..848c56e7551 100644
--- a/sys/netinet/ip_esp.h
+++ b/sys/netinet/ip_esp.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_esp.h,v 1.35 2001/06/25 05:11:58 angelos Exp $ */
+/* $OpenBSD: ip_esp.h,v 1.36 2001/07/04 23:14:55 espie Exp $ */
/*
* The authors of this code are John Ioannidis (ji@tla.org),
* Angelos D. Keromytis (kermit@csd.uch.gr) and
@@ -78,4 +78,4 @@ struct espstat
extern int esp_enable;
struct espstat espstat;
#endif /* _KERNEL */
-#endif _NETINET_IP_ESP_H_
+#endif /* _NETINET_IP_ESP_H_ */
diff --git a/sys/netinet/ip_ipip.c b/sys/netinet/ip_ipip.c
index f63ca4419dd..61dcbaaffb8 100644
--- a/sys/netinet/ip_ipip.c
+++ b/sys/netinet/ip_ipip.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_ipip.c,v 1.19 2001/06/26 04:29:05 angelos Exp $ */
+/* $OpenBSD: ip_ipip.c,v 1.20 2001/07/04 23:14:55 espie Exp $ */
/*
* The authors of this code are John Ioannidis (ji@tla.org),
* Angelos D. Keromytis (kermit@csd.uch.gr) and
@@ -189,7 +189,7 @@ ipip_input(struct mbuf *m, int iphlen)
return;
}
}
-#endif MROUTING
+#endif /* MROUTING */
/* Keep outer ecn field. */
#ifdef INET
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index 9b9beb37ef8..54d5043454a 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcp_input.c,v 1.98 2001/06/24 22:50:58 angelos Exp $ */
+/* $OpenBSD: tcp_input.c,v 1.99 2001/07/04 23:14:56 espie Exp $ */
/* $NetBSD: tcp_input.c,v 1.23 1996/02/13 23:43:44 christos Exp $ */
/*
@@ -2677,7 +2677,7 @@ tcp_sack_partialack(tp, th)
}
return 0;
}
-#endif TCP_SACK
+#endif /* TCP_SACK */
/*
* Pull out of band byte out of a segment so