summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>1999-03-02 15:35:13 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>1999-03-02 15:35:13 +0000
commit51bab11268a3d28219282fd032456b10cbb3179b (patch)
treef63727ebc2ca5c3d135f7924b3458ba5b4838006
parent665060f87f628dad9411ae6a855e50a9812fc45f (diff)
conf.c: Merge with EOM 1.15
One include too much conf.h: Merge with EOM 1.7 Forgotten include file
-rw-r--r--sbin/isakmpd/conf.c5
-rw-r--r--sbin/isakmpd/conf.h5
2 files changed, 5 insertions, 5 deletions
diff --git a/sbin/isakmpd/conf.c b/sbin/isakmpd/conf.c
index cd6b4bd0707..99238816df8 100644
--- a/sbin/isakmpd/conf.c
+++ b/sbin/isakmpd/conf.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: conf.c,v 1.6 1999/02/26 03:34:26 niklas Exp $ */
-/* $EOM: conf.c,v 1.14 1999/02/25 11:38:47 niklas Exp $ */
+/* $OpenBSD: conf.c,v 1.7 1999/03/02 15:35:12 niklas Exp $ */
+/* $EOM: conf.c,v 1.15 1999/03/02 15:33:33 niklas Exp $ */
/*
* Copyright (c) 1998 Niklas Hallqvist. All rights reserved.
@@ -35,7 +35,6 @@
*/
#include <sys/param.h>
-#include <sys/types.h>
#include <sys/mman.h>
#include <sys/queue.h>
#include <sys/stat.h>
diff --git a/sbin/isakmpd/conf.h b/sbin/isakmpd/conf.h
index 8377371309b..f2bca251062 100644
--- a/sbin/isakmpd/conf.h
+++ b/sbin/isakmpd/conf.h
@@ -1,5 +1,5 @@
-/* $OpenBSD: conf.h,v 1.5 1999/02/26 03:34:55 niklas Exp $ */
-/* $EOM: conf.h,v 1.6 1999/02/25 11:09:32 niklas Exp $ */
+/* $OpenBSD: conf.h,v 1.6 1999/03/02 15:35:12 niklas Exp $ */
+/* $EOM: conf.h,v 1.7 1999/03/02 15:33:19 niklas Exp $ */
/*
* Copyright (c) 1998 Niklas Hallqvist. All rights reserved.
@@ -37,6 +37,7 @@
#ifndef _CONF_H_
#define _CONF_H_
+#include <sys/types.h>
#include <sys/queue.h>
#include <stdio.h>