From 252af56144f4fa22a14d4babd8fe0ad1598fe18f Mon Sep 17 00:00:00 2001 From: Till Straumann Date: Mon, 8 Sep 2014 23:08:33 -0700 Subject: [PATCH] - renamed symbol that clashed on solaris --- src/libCom/test/epicsStackTraceTest.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libCom/test/epicsStackTraceTest.c b/src/libCom/test/epicsStackTraceTest.c index c42206b11..9ad91adb7 100644 --- a/src/libCom/test/epicsStackTraceTest.c +++ b/src/libCom/test/epicsStackTraceTest.c @@ -57,7 +57,7 @@ void nopFn(int lvl) RecFn volatile lfp = epicsStackTraceRecurseLcl; RecFn volatile gfp = epicsStackTraceRecurseGbl; -RecFn volatile nop = nopFn; +RecFn volatile nfp = nopFn; static void epicsStackTraceRecurseLcl(int lvl) @@ -70,7 +70,7 @@ epicsStackTraceRecurseLcl(int lvl) /* call something so that the call through gfp() doesn't * get optimized into a jump (tail-call optimization) */ - nop(0); + nfp(0); } void epicsStackTraceRecurseGbl(int lvl) @@ -83,7 +83,7 @@ void epicsStackTraceRecurseGbl(int lvl) /* call something so that the call through gfp() doesn't * get optimized into a jump (tail-call optimization) */ - nop(0); + nfp(0); } static void logClient(void *ptr, const char *msg)