From 1ca09e6115f8c42f664566d779605ab0aeb1c469 Mon Sep 17 00:00:00 2001
From: robert <robert@openbsd.org>
Date: Tue, 7 Dec 2021 14:00:33 +0000
Subject: [PATCH] switch from tradcpp(1) to cpp(1); ok jsg@

---
 usr.bin/calendar/io.c        | 4 ++--
 usr.bin/calendar/pathnames.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/usr.bin/calendar/io.c b/usr.bin/calendar/io.c
index 3c42395f5ce..41bc786d579 100644
--- a/usr.bin/calendar/io.c
+++ b/usr.bin/calendar/io.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: io.c,v 1.50 2021/10/24 21:24:16 deraadt Exp $	*/
+/*	$OpenBSD: io.c,v 1.51 2021/12/07 14:00:33 robert Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993, 1994
@@ -362,7 +362,7 @@ opencal(void)
 			(void)close(fderr);
 		}
 		execl(_PATH_CPP, "cpp", "-traditional", "-undef", "-U__GNUC__",
-		    "-P", "-I.", _PATH_INCLUDE, (char *)NULL);
+		    "-P", "-I.", "-w", _PATH_INCLUDE, (char *)NULL);
 		warn(_PATH_CPP);
 		_exit(1);
 	}
diff --git a/usr.bin/calendar/pathnames.h b/usr.bin/calendar/pathnames.h
index 534b7f93586..5cd0d7095fa 100644
--- a/usr.bin/calendar/pathnames.h
+++ b/usr.bin/calendar/pathnames.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pathnames.h,v 1.5 2014/07/30 16:46:17 jsg Exp $	*/
+/*	$OpenBSD: pathnames.h,v 1.6 2021/12/07 14:00:33 robert Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -33,7 +33,7 @@
 
 #include <paths.h>
 
-#define	_PATH_CPP	"/usr/libexec/tradcpp"
+#define	_PATH_CPP	"/usr/libexec/cpp"
 
 			/* XXX -- fix when cpp parses arguments rationally */
 #define	_PATH_INCLUDE	"-I/usr/share/calendar"
-- 
2.20.1