diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-04-07 22:04:59 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-04-07 22:04:59 +0000 |
| commit | 30eb4be6362590d47eae6dfcef28c9ef60451137 (patch) | |
| tree | c53d618ca0586bcc4ff39c0af61f1ef16b1a77bf /sbin/isakmpd | |
| parent | 46bc60db1844588903a4aa923f2ff257b534fd71 (diff) | |
Merge with EOM 1.49
author: ho
Missing #ifndef linux
Diffstat (limited to 'sbin/isakmpd')
| -rw-r--r-- | sbin/isakmpd/udp.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sbin/isakmpd/udp.c b/sbin/isakmpd/udp.c index f57249ebd0e..e13f4635341 100644 --- a/sbin/isakmpd/udp.c +++ b/sbin/isakmpd/udp.c @@ -1,5 +1,5 @@ -/* $OpenBSD: udp.c,v 1.20 2000/03/08 08:43:16 niklas Exp $ */ -/* $EOM: udp.c,v 1.48 2000/03/07 21:37:52 ho Exp $ */ +/* $OpenBSD: udp.c,v 1.21 2000/04/07 22:04:58 niklas Exp $ */ +/* $EOM: udp.c,v 1.49 2000/03/14 19:42:32 ho Exp $ */ /* * Copyright (c) 1998, 1999 Niklas Hallqvist. All rights reserved. @@ -38,7 +38,9 @@ #include <sys/types.h> #include <sys/ioctl.h> #include <sys/socket.h> +#ifndef linux #include <sys/sockio.h> +#endif #include <net/if.h> #include <netinet/in.h> #include <arpa/inet.h> |