summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjsg <jsg@openbsd.org>2010-04-28 18:20:15 +0000
committerjsg <jsg@openbsd.org>2010-04-28 18:20:15 +0000
commitb0589fba69cdf91d3dddb4eea0fa58b56a2fb358 (patch)
tree4288d390a1103d06bda119b7a6dfe486b1b06170
parentFix crash when resizing in copy mode, when cursor can end up outside screen. (diff)
downloadwireguard-openbsd-b0589fba69cdf91d3dddb4eea0fa58b56a2fb358.tar.xz
wireguard-openbsd-b0589fba69cdf91d3dddb4eea0fa58b56a2fb358.zip
shuffle extern decl of header[] so gcc4 doesn't complain about
incomplete types. ok deraadt@ 'Looks acceptable' miod@
-rw-r--r--usr.bin/calendar/calendar.h3
-rw-r--r--usr.bin/calendar/day.c4
2 files changed, 4 insertions, 3 deletions
diff --git a/usr.bin/calendar/calendar.h b/usr.bin/calendar/calendar.h
index 82d35018dab..b6ea8175f27 100644
--- a/usr.bin/calendar/calendar.h
+++ b/usr.bin/calendar/calendar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: calendar.h,v 1.12 2005/08/09 12:32:58 mickey Exp $ */
+/* $OpenBSD: calendar.h,v 1.13 2010/04/28 18:20:15 jsg Exp $ */
/*
* Copyright (c) 1989, 1993, 1994
@@ -34,7 +34,6 @@ extern struct passwd *pw;
extern int doall;
extern int bodun_always;
extern time_t f_time;
-extern struct iovec header[];
extern struct tm *tp;
extern char *calendarFile;
extern char *calendarHome;
diff --git a/usr.bin/calendar/day.c b/usr.bin/calendar/day.c
index 73e0c39272b..0a3a13f9b36 100644
--- a/usr.bin/calendar/day.c
+++ b/usr.bin/calendar/day.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: day.c,v 1.22 2009/10/27 23:59:36 deraadt Exp $ */
+/* $OpenBSD: day.c,v 1.23 2010/04/28 18:20:15 jsg Exp $ */
/*
* Copyright (c) 1989, 1993, 1994
@@ -44,6 +44,8 @@
#include "pathnames.h"
#include "calendar.h"
+extern struct iovec header[];
+
#define WEEKLY 1
#define MONTHLY 2
#define YEARLY 3