libCom: actually use libComAPI.h in libCom

modules/libcom/src/error/errSymLib.c

@@ -19,7 +19,6 @@
 #include <math.h>
 #include <limits.h>
 
-#define epicsExportSharedSymbols
 #include "cantProceed.h"
 #include "epicsAssert.h"
 #include "epicsStdio.h"

modules/libcom/src/error/errSymTbl.h

@@ -12,7 +12,7 @@
 
 #include <stddef.h>
 
-#include "shareLib.h"
+#include "libComAPI.h"
 #include "epicsTypes.h"
 
 /* ERRSYMBOL - entry in symbol table */
@@ -34,14 +34,14 @@ typedef ERRSYMTAB *ERRSYMTAB_ID;
 extern "C" {
 #endif
 
-epicsShareFunc void errSymLookup(long status, char *pBuf, size_t bufLength);
-epicsShareFunc const char* errSymMsg(long status);
-epicsShareFunc void errSymTest(epicsUInt16 modnum, epicsUInt16 begErrNum,
+LIBCOM_API void errSymLookup(long status, char *pBuf, size_t bufLength);
+LIBCOM_API const char* errSymMsg(long status);
+LIBCOM_API void errSymTest(epicsUInt16 modnum, epicsUInt16 begErrNum,
     epicsUInt16 endErrNum);
-epicsShareFunc void errSymTestPrint(long errNum);
-epicsShareFunc int errSymBld(void);
-epicsShareFunc int errSymbolAdd(long errNum, const char *name);
-epicsShareFunc void errSymDump(void);
+LIBCOM_API void errSymTestPrint(long errNum);
+LIBCOM_API int errSymBld(void);
+LIBCOM_API int errSymbolAdd(long errNum, const char *name);
+LIBCOM_API void errSymDump(void);
 
 #ifdef __cplusplus
 }

modules/libcom/src/error/errlog.c

@@ -18,7 +18,6 @@
 #include <string.h>
 #include <errno.h>
 
-#define epicsExportSharedSymbols
 #define ERRLOG_INIT
 #include "adjustment.h"
 #include "dbDefs.h"
@@ -39,7 +38,7 @@
 #define MAX_MESSAGE_SIZE 256
 
 /*Declare storage for errVerbose */
-epicsShareDef int errVerbose = 0;
+int errVerbose = 0;
 
 static void errlogExitHandler(void *);
 static void errlogThread(void);

modules/libcom/src/error/errlog.h

@@ -14,7 +14,7 @@
 #include <stddef.h>
 #include <stdio.h>
 
-#include "shareLib.h"
+#include "libComAPI.h"
 #include "compilerDependencies.h"
 
 #ifdef __cplusplus
@@ -30,18 +30,18 @@ typedef enum {
     errlogFatal
 } errlogSevEnum;
 
-epicsShareExtern int errVerbose;
+LIBCOM_API extern int errVerbose;
 
 
 #ifdef ERRLOG_INIT
-    epicsShareDef const char *errlogSevEnumString[] = {
+    const char *errlogSevEnumString[] = {
         "info",
         "minor",
         "major",
         "fatal"
     };
 #else
-    epicsShareExtern const char * errlogSevEnumString[];
+    LIBCOM_API extern const char * errlogSevEnumString[];
 #endif
 
 /* errMessage is a macro so it can get the file and line number */
@@ -51,38 +51,38 @@ epicsShareExtern int errVerbose;
 #define epicsPrintf errlogPrintf
 #define epicsVprintf errlogVprintf
 
-epicsShareFunc int errlogPrintf(const char *pformat, ...)
+LIBCOM_API int errlogPrintf(const char *pformat, ...)
     EPICS_PRINTF_STYLE(1,2);
-epicsShareFunc int errlogVprintf(const char *pformat, va_list pvar);
-epicsShareFunc int errlogSevPrintf(const errlogSevEnum severity,
+LIBCOM_API int errlogVprintf(const char *pformat, va_list pvar);
+LIBCOM_API int errlogSevPrintf(const errlogSevEnum severity,
     const char *pformat, ...) EPICS_PRINTF_STYLE(2,3);
-epicsShareFunc int errlogSevVprintf(const errlogSevEnum severity,
+LIBCOM_API int errlogSevVprintf(const errlogSevEnum severity,
     const char *pformat, va_list pvar);
-epicsShareFunc int errlogMessage(const char *message);
+LIBCOM_API int errlogMessage(const char *message);
 
-epicsShareFunc const char * errlogGetSevEnumString(errlogSevEnum severity);
-epicsShareFunc void errlogSetSevToLog(errlogSevEnum severity);
-epicsShareFunc errlogSevEnum errlogGetSevToLog(void);
+LIBCOM_API const char * errlogGetSevEnumString(errlogSevEnum severity);
+LIBCOM_API void errlogSetSevToLog(errlogSevEnum severity);
+LIBCOM_API errlogSevEnum errlogGetSevToLog(void);
 
-epicsShareFunc void errlogAddListener(errlogListener listener, void *pPrivate);
-epicsShareFunc int errlogRemoveListeners(errlogListener listener,
+LIBCOM_API void errlogAddListener(errlogListener listener, void *pPrivate);
+LIBCOM_API int errlogRemoveListeners(errlogListener listener,
     void *pPrivate);
 
-epicsShareFunc int eltc(int yesno);
-epicsShareFunc int errlogSetConsole(FILE *stream);
+LIBCOM_API int eltc(int yesno);
+LIBCOM_API int errlogSetConsole(FILE *stream);
 
-epicsShareFunc int errlogInit(int bufsize);
-epicsShareFunc int errlogInit2(int bufsize, int maxMsgSize);
-epicsShareFunc void errlogFlush(void);
+LIBCOM_API int errlogInit(int bufsize);
+LIBCOM_API int errlogInit2(int bufsize, int maxMsgSize);
+LIBCOM_API void errlogFlush(void);
 
-epicsShareFunc void errPrintf(long status, const char *pFileName, int lineno,
+LIBCOM_API void errPrintf(long status, const char *pFileName, int lineno,
     const char *pformat, ...) EPICS_PRINTF_STYLE(4,5);
 
-epicsShareFunc int errlogPrintfNoConsole(const char *pformat, ...)
+LIBCOM_API int errlogPrintfNoConsole(const char *pformat, ...)
     EPICS_PRINTF_STYLE(1,2);
-epicsShareFunc int errlogVprintfNoConsole(const char *pformat,va_list pvar);
+LIBCOM_API int errlogVprintfNoConsole(const char *pformat,va_list pvar);
 
-epicsShareFunc void errSymLookup(long status, char *pBuf, size_t bufLength);
+LIBCOM_API void errSymLookup(long status, char *pBuf, size_t bufLength);
 
 #ifdef __cplusplus
 }