diff options
| author |   krw <krw@openbsd.org> | 2014-11-19 13:35:36 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2014-11-19 13:35:36 +0000 |
| commit | 036c7a3474848baffbbaeccc94a4652c4153e6cb (patch) | |
| tree | 9477224563231b76a3323b5036497d38a020be64 | |
| parent | move to stravis so doug@ will stop laughing at my misuse of strnvis. (diff) | |
| download | wireguard-openbsd-036c7a3474848baffbbaeccc94a4652c4153e6cb.tar.xz wireguard-openbsd-036c7a3474848baffbbaeccc94a4652c4153e6cb.zip | |
Nuke yet more obvious #include duplications.
ok deraadt@
| -rw-r--r-- | lib/libcrypto/engine/eng_rsax.c | 4 | ||||
| -rw-r--r-- | lib/libkvm/kvm_file2.c | 3 | ||||
| -rw-r--r-- | lib/libssl/src/crypto/engine/eng_rsax.c | 4 | ||||
| -rw-r--r-- | libexec/getty/main.c | 3 | ||||
| -rw-r--r-- | libexec/ld.so/ldconfig/sod.c | 3 | ||||
| -rw-r--r-- | regress/lib/libsndio/vol/vol.c | 1 | ||||
| -rw-r--r-- | regress/usr.bin/ssh/unittests/test_helper/fuzz.c | 3 | ||||
| -rw-r--r-- | sbin/isakmpd/nat_traversal.c | 3 |
8 files changed, 7 insertions, 17 deletions
diff --git a/lib/libcrypto/engine/eng_rsax.c b/lib/libcrypto/engine/eng_rsax.c index 728b89d5f38..c33a776707c 100644 --- a/lib/libcrypto/engine/eng_rsax.c +++ b/lib/libcrypto/engine/eng_rsax.c @@ -1,4 +1,4 @@ -/* $OpenBSD: eng_rsax.c,v 1.11 2014/08/11 13:29:43 bcook Exp $ */ +/* $OpenBSD: eng_rsax.c,v 1.12 2014/11/19 13:35:37 krw Exp $ */ /* Copyright (c) 2010-2010 Intel Corp. * Author: Vinodh.Gopal@intel.com * Jim Guilford @@ -67,8 +67,6 @@ #include <stdio.h> #include <string.h> -#include <openssl/opensslconf.h> - #include <openssl/crypto.h> #include <openssl/buffer.h> #include <openssl/engine.h> diff --git a/lib/libkvm/kvm_file2.c b/lib/libkvm/kvm_file2.c index fc328525b82..c89b4719d1c 100644 --- a/lib/libkvm/kvm_file2.c +++ b/lib/libkvm/kvm_file2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kvm_file2.c,v 1.39 2014/11/03 17:20:46 bluhm Exp $ */ +/* $OpenBSD: kvm_file2.c,v 1.40 2014/11/19 13:35:36 krw Exp $ */ /* * Copyright (c) 2009 Todd C. Miller <Todd.Miller@courtesan.com> @@ -108,7 +108,6 @@ #include <db.h> #include <stddef.h> #include <stdlib.h> -#include <stddef.h> #include <string.h> #include <unistd.h> diff --git a/lib/libssl/src/crypto/engine/eng_rsax.c b/lib/libssl/src/crypto/engine/eng_rsax.c index 728b89d5f38..c33a776707c 100644 --- a/lib/libssl/src/crypto/engine/eng_rsax.c +++ b/lib/libssl/src/crypto/engine/eng_rsax.c @@ -1,4 +1,4 @@ -/* $OpenBSD: eng_rsax.c,v 1.11 2014/08/11 13:29:43 bcook Exp $ */ +/* $OpenBSD: eng_rsax.c,v 1.12 2014/11/19 13:35:37 krw Exp $ */ /* Copyright (c) 2010-2010 Intel Corp. * Author: Vinodh.Gopal@intel.com * Jim Guilford @@ -67,8 +67,6 @@ #include <stdio.h> #include <string.h> -#include <openssl/opensslconf.h> - #include <openssl/crypto.h> #include <openssl/buffer.h> #include <openssl/engine.h> diff --git a/libexec/getty/main.c b/libexec/getty/main.c index 994275e0575..b0824f20245 100644 --- a/libexec/getty/main.c +++ b/libexec/getty/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.33 2014/11/18 20:51:00 krw Exp $ */ +/* $OpenBSD: main.c,v 1.34 2014/11/19 13:35:37 krw Exp $ */ /*- * Copyright (c) 1980, 1993 @@ -40,7 +40,6 @@ #include <fcntl.h> #include <time.h> #include <ctype.h> -#include <fcntl.h> #include <stdlib.h> #include <string.h> #include <syslog.h> diff --git a/libexec/ld.so/ldconfig/sod.c b/libexec/ld.so/ldconfig/sod.c index 183d02a22be..0295b3763a5 100644 --- a/libexec/ld.so/ldconfig/sod.c +++ b/libexec/ld.so/ldconfig/sod.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sod.c,v 1.5 2014/07/10 09:03:02 otto Exp $ */ +/* $OpenBSD: sod.c,v 1.6 2014/11/19 13:35:37 krw Exp $ */ /* * Copyright (c) 1993 Paul Kranenburg @@ -40,7 +40,6 @@ #include <fcntl.h> #include <nlist.h> #include <link.h> -#include <limits.h> #include <string.h> #include <stdlib.h> #include <unistd.h> diff --git a/regress/lib/libsndio/vol/vol.c b/regress/lib/libsndio/vol/vol.c index 9cff949dd2a..d17c92d8d7e 100644 --- a/regress/lib/libsndio/vol/vol.c +++ b/regress/lib/libsndio/vol/vol.c @@ -5,7 +5,6 @@ #include <string.h> #include <stdlib.h> #include <unistd.h> -#include <poll.h> #include <termios.h> #include <sndio.h> #include "tools.h" diff --git a/regress/usr.bin/ssh/unittests/test_helper/fuzz.c b/regress/usr.bin/ssh/unittests/test_helper/fuzz.c index b64af24ed11..3ccab7d2461 100644 --- a/regress/usr.bin/ssh/unittests/test_helper/fuzz.c +++ b/regress/usr.bin/ssh/unittests/test_helper/fuzz.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fuzz.c,v 1.3 2014/05/02 09:41:32 andre Exp $ */ +/* $OpenBSD: fuzz.c,v 1.4 2014/11/19 13:35:37 krw Exp $ */ /* * Copyright (c) 2011 Damien Miller <djm@mindrot.org> * @@ -25,7 +25,6 @@ #include <stdint.h> #include <stdlib.h> #include <string.h> -#include <assert.h> #include "test_helper.h" diff --git a/sbin/isakmpd/nat_traversal.c b/sbin/isakmpd/nat_traversal.c index d26a1c36a94..0f99a21c085 100644 --- a/sbin/isakmpd/nat_traversal.c +++ b/sbin/isakmpd/nat_traversal.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nat_traversal.c,v 1.21 2012/10/29 17:09:52 markus Exp $ */ +/* $OpenBSD: nat_traversal.c,v 1.22 2014/11/19 13:35:37 krw Exp $ */ /* * Copyright (c) 2004 Håkan Olsson. All rights reserved. @@ -35,7 +35,6 @@ #include "isakmp_fld.h" #include "isakmp_num.h" #include "ipsec_num.h" -#include "hash.h" #include "log.h" #include "message.h" #include "nat_traversal.h" |