From 350b07a0361b13537a91a27be5e05194cf87d2ea Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 29 Aug 2018 12:34:58 -0500 Subject: monlib.[ch]: Fix warnings for external vs internal use of .h --- bsps/arm/csb337/umon/monlib.c | 1 + bsps/include/umon/monlib.h | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'bsps') diff --git a/bsps/arm/csb337/umon/monlib.c b/bsps/arm/csb337/umon/monlib.c index 36f9158a36..44c9ec01d0 100644 --- a/bsps/arm/csb337/umon/monlib.c +++ b/bsps/arm/csb337/umon/monlib.c @@ -43,6 +43,7 @@ * standards and to eliminate C++ style comments. */ +#define _INSIDE_MONLIB #include static int (*_tfsseek)(int,int,int); diff --git a/bsps/include/umon/monlib.h b/bsps/include/umon/monlib.h index efbfc93d59..c26350f70b 100644 --- a/bsps/include/umon/monlib.h +++ b/bsps/include/umon/monlib.h @@ -148,16 +148,16 @@ extern unsigned long mon_assignhandler(long hnum, extern struct tfshdr *mon_tfsnext(struct tfshdr *tfp); extern struct tfshdr *mon_tfsstat(char *filename); -#if SHOWVARARGS +/* + * The external caller should see these as variable argument methods but + * they are not implemented that way, so let monlib.c prototype them internally + * when building that file. + */ +#ifndef _INSIDE_MONLIB extern void mon_memtrace(char *fmt, ...); extern int mon_printf(char *fmt, ...); extern int mon_cprintf(char *fmt, ...); extern int mon_sprintf(char *,char *fmt, ...); -#else -extern void mon_memtrace(); -extern int mon_printf(); -extern int mon_cprintf(); -extern int mon_sprintf(); #endif #ifdef __cplusplus -- cgit v1.2.3