From 8569e6d26fd29f294d57556215236cd14140710c Mon Sep 17 00:00:00 2001
From: roy <roy@NetBSD.org>
Date: Thu, 28 Nov 2019 12:33:23 +0000
Subject: [PATCH] Make it easier to use strtoi and strtou in downsteam
 applications without the need to define HAVE_NBTOOL_CONFIG_H and yet allow
 -Wundef not to log any warnings.

---
 common/lib/libc/stdlib/strtoi.c | 6 +++---
 common/lib/libc/stdlib/strtou.c | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/lib/libc/stdlib/strtoi.c b/common/lib/libc/stdlib/strtoi.c
index 5817e01ee14f..2afcfcc17c37 100644
--- a/common/lib/libc/stdlib/strtoi.c
+++ b/common/lib/libc/stdlib/strtoi.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: strtoi.c,v 1.2 2015/05/01 14:17:56 christos Exp $	*/
+/*	$NetBSD: strtoi.c,v 1.3 2019/11/28 12:33:23 roy Exp $	*/
 
 /*-
  * Copyright (c) 2005 The DragonFly Project.  All rights reserved.
@@ -30,12 +30,12 @@
  * NetBSD: src/common/lib/libc/stdlib/strtoul.c,v 1.3 2008/08/20 19:58:34 oster Exp
  */
 
-#if HAVE_NBTOOL_CONFIG_H
+#if defined(HAVE_NBTOOL_CONFIG_H) && HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: strtoi.c,v 1.2 2015/05/01 14:17:56 christos Exp $");
+__RCSID("$NetBSD: strtoi.c,v 1.3 2019/11/28 12:33:23 roy Exp $");
 
 #ifdef _LIBC
 #include "namespace.h"
diff --git a/common/lib/libc/stdlib/strtou.c b/common/lib/libc/stdlib/strtou.c
index 9ce2897ecefb..979796752921 100644
--- a/common/lib/libc/stdlib/strtou.c
+++ b/common/lib/libc/stdlib/strtou.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: strtou.c,v 1.2 2015/05/01 14:17:56 christos Exp $	*/
+/*	$NetBSD: strtou.c,v 1.3 2019/11/28 12:33:23 roy Exp $	*/
 
 /*-
  * Copyright (c) 2005 The DragonFly Project.  All rights reserved.
@@ -30,12 +30,12 @@
  * NetBSD: src/common/lib/libc/stdlib/strtoul.c,v 1.3 2008/08/20 19:58:34 oster Exp
  */
 
-#if HAVE_NBTOOL_CONFIG_H
+#if defined(HAVE_NBTOOL_CONFIG_H) && HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: strtou.c,v 1.2 2015/05/01 14:17:56 christos Exp $");
+__RCSID("$NetBSD: strtou.c,v 1.3 2019/11/28 12:33:23 roy Exp $");
 
 #ifdef _LIBC
 #include "namespace.h"