Module Name: src
Committed By: jmcneill
Date: Sun Oct 17 14:12:21 UTC 2021
Modified Files:
src/sys/lib/libsa: bootcfg.c
Log Message:
Only define DEFAULT_TIMEOUT if it is not already defined.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/lib/libsa/bootcfg.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/lib/libsa/bootcfg.c
diff -u src/sys/lib/libsa/bootcfg.c:1.7 src/sys/lib/libsa/bootcfg.c:1.8
--- src/sys/lib/libsa/bootcfg.c:1.7 Tue Sep 7 11:41:31 2021
+++ src/sys/lib/libsa/bootcfg.c Sun Oct 17 14:12:21 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: bootcfg.c,v 1.7 2021/09/07 11:41:31 nia Exp $ */
+/* $NetBSD: bootcfg.c,v 1.8 2021/10/17 14:12:21 jmcneill Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -38,7 +38,9 @@
#define MENUFORMAT_LETTER 2
#define DEFAULT_FORMAT MENUFORMAT_AUTO
+#ifndef DEFAULT_TIMEOUT
#define DEFAULT_TIMEOUT 10
+#endif
struct bootcfg_def bootcfg_info;
