From 4e1677a38f39807aed3c3d3761f991a87c00fd16 Mon Sep 17 00:00:00 2001 From: Till Straumann Date: Mon, 8 Sep 2014 22:28:41 -0700 Subject: [PATCH] - (hopefully) correct usage of sharedLib.h... --- src/libCom/osi/os/Darwin/osdFindAddr.c | 4 ++-- src/libCom/osi/os/default/osdBackTrace.c | 3 ++- src/libCom/osi/os/default/osdFindAddr.c | 5 +++-- src/libCom/osi/os/posix/osdBackTrace.c | 3 ++- src/libCom/osi/os/posix/osdFindAddr.c | 8 +++++--- 5 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/libCom/osi/os/Darwin/osdFindAddr.c b/src/libCom/osi/os/Darwin/osdFindAddr.c index 306279d2e..d2f5a4465 100644 --- a/src/libCom/osi/os/Darwin/osdFindAddr.c +++ b/src/libCom/osi/os/Darwin/osdFindAddr.c @@ -12,13 +12,13 @@ #include +#define epicsExportSharedSymbols #include "epicsStackTrace.h" #include "epicsStackTracePvt.h" - /* Darwin's finds local symbols, too :-) */ -epicsShareFunc int epicsFindAddr(void *addr, epicsSymbol *sym_p) +int epicsFindAddr(void *addr, epicsSymbol *sym_p) { Dl_info inf; diff --git a/src/libCom/osi/os/default/osdBackTrace.c b/src/libCom/osi/os/default/osdBackTrace.c index c8bccd61f..c77572351 100644 --- a/src/libCom/osi/os/default/osdBackTrace.c +++ b/src/libCom/osi/os/default/osdBackTrace.c @@ -7,9 +7,10 @@ * Author: Till Straumann , 2011 */ +#define epicsExportSharedSymbols #include "epicsStackTracePvt.h" -epicsShareFunc int epicsBackTrace(void **buf, int buf_sz) +int epicsBackTrace(void **buf, int buf_sz) { return -1; } diff --git a/src/libCom/osi/os/default/osdFindAddr.c b/src/libCom/osi/os/default/osdFindAddr.c index d3d69cdec..4cda3977d 100644 --- a/src/libCom/osi/os/default/osdFindAddr.c +++ b/src/libCom/osi/os/default/osdFindAddr.c @@ -7,15 +7,16 @@ * Author: Till Straumann , 2011 */ +#define epicsExportSharedSymbols #include "epicsStackTracePvt.h" #include "epicsStackTrace.h" -epicsShareFunc int epicsFindAddr(void *addr, epicsSymbol *sym_p) +int epicsFindAddr(void *addr, epicsSymbol *sym_p) { return -1; } -epicsShareFunc int epicsStackTraceGetFeatures(void) +int epicsStackTraceGetFeatures(void) { return 0; } diff --git a/src/libCom/osi/os/posix/osdBackTrace.c b/src/libCom/osi/os/posix/osdBackTrace.c index 806082a73..41a15a585 100644 --- a/src/libCom/osi/os/posix/osdBackTrace.c +++ b/src/libCom/osi/os/posix/osdBackTrace.c @@ -9,9 +9,10 @@ #include +#define epicsExportSharedSymbols #include "epicsStackTracePvt.h" -epicsShareFunc int epicsBackTrace(void **buf, int buf_sz) +int epicsBackTrace(void **buf, int buf_sz) { return backtrace(buf, buf_sz); } diff --git a/src/libCom/osi/os/posix/osdFindAddr.c b/src/libCom/osi/os/posix/osdFindAddr.c index 7395b5c37..830603aef 100644 --- a/src/libCom/osi/os/posix/osdFindAddr.c +++ b/src/libCom/osi/os/posix/osdFindAddr.c @@ -25,13 +25,15 @@ #include #endif -#include "epicsStackTrace.h" -#include "epicsStackTracePvt.h" #include "epicsThread.h" #include "epicsMutex.h" #include +#define epicsExportSharedSymbols +#include "epicsStackTrace.h" +#include "epicsStackTracePvt.h" + #define FIND_ADDR_DEBUG 0 /* Darwin and GNU have dladdr() and Darwin's already finds local @@ -633,7 +635,7 @@ size_t idx; return 0; } -epicsShareFunc int epicsStackTraceGetFeatures(void) +int epicsStackTraceGetFeatures(void) { /* We are a bit conservative here. The actual * situation depends on how we are linked (something