From 410c2c4f30e8aa00dfa2b10137d58a3cb93cdc12 Mon Sep 17 00:00:00 2001 From: Dirk Zimoch Date: Fri, 21 Apr 2017 09:47:22 +0200 Subject: [PATCH] bugfix for non-GNU compilers --- dbLoadTemplate.y | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dbLoadTemplate.y b/dbLoadTemplate.y index 8761e7c..4b216bc 100644 --- a/dbLoadTemplate.y +++ b/dbLoadTemplate.y @@ -461,13 +461,14 @@ static const iocshFuncDef dbLoadTemplateDef = { }}; #ifdef __GNUC__ -/* Without this I somehow always get the original dbLoadTemplate linked instead of my version */ -int __dbLoadTemplate(const char *sub_file, const char *cmd_collect, const char *path) __attribute__ ((weak, alias ("dbLoadTemplate"))); +/* Without this I always get the original dbLoadTemplate linked instead of my version */ +int __dbLoadTemplate(const char *sub_file, const char *cmd_collect, const char *path) __attribute__ ((alias ("dbLoadTemplate"))); +#define dbLoadTemplate __dbLoadTemplate #endif static void dbLoadTemplateFunc(const iocshArgBuf *args) { - __dbLoadTemplate(args[0].sval, args[1].sval, args[2].sval); + dbLoadTemplate(args[0].sval, args[1].sval, args[2].sval); } typedef struct iocshCommand {