libCom: actually use libComAPI.h in libCom

modules/libcom/src/log/iocLog.c

@@ -16,7 +16,6 @@
 #include <stdio.h>
 #include <limits.h>
 
-#define epicsExportSharedSymbols
 #include "envDefs.h"
 #include "errlog.h"
 #include "logClient.h"
@@ -69,7 +68,7 @@ static int getConfig (struct in_addr *pserver_addr, unsigned short *pserver_port
 /*
  *  iocLogFlush ()
  */
-void epicsShareAPI epicsShareAPI iocLogFlush (void)
+void epicsStdCall epicsStdCall iocLogFlush (void)
 {
     if (iocLogClient!=NULL) {
         logClientFlush (iocLogClient);
@@ -119,7 +118,7 @@ static logClientId iocLogClientInit (void)
 /*
  *  iocLogInit()
  */
-int epicsShareAPI iocLogInit (void)
+int epicsStdCall iocLogInit (void)
 {
     /*
      * check for global disable
@@ -145,7 +144,7 @@ int epicsShareAPI iocLogInit (void)
 /*
  *  iocLogShow ()
  */
-void epicsShareAPI iocLogShow (unsigned level)
+void epicsStdCall iocLogShow (unsigned level)
 {
     if (iocLogClient!=NULL) {
         logClientShow (iocLogClient, level);
@@ -155,7 +154,7 @@ void epicsShareAPI iocLogShow (unsigned level)
 /*
  *  logClientInit(); deprecated
  */
-logClientId epicsShareAPI logClientInit (void)
+logClientId epicsStdCall logClientInit (void)
 {
     return iocLogClientInit ();
 }

modules/libcom/src/log/iocLog.h

@@ -17,7 +17,7 @@
 
 #ifndef INCiocLogh
 #define INCiocLogh 1
-#include "shareLib.h"
+#include "libComAPI.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -26,10 +26,10 @@ extern "C" {
 /*
  * ioc log client interface
  */
-epicsShareExtern int iocLogDisable;
-epicsShareFunc int epicsShareAPI iocLogInit (void);
-epicsShareFunc void epicsShareAPI iocLogShow (unsigned level);
-epicsShareFunc void epicsShareAPI iocLogFlush (void);
+LIBCOM_API extern int iocLogDisable;
+LIBCOM_API int epicsStdCall iocLogInit (void);
+LIBCOM_API void epicsStdCall iocLogShow (unsigned level);
+LIBCOM_API void epicsStdCall iocLogFlush (void);
 
 #ifdef __cplusplus
 }

modules/libcom/src/log/logClient.c

@@ -20,7 +20,6 @@
 #include <stdio.h>
 
 #define EPICS_PRIVATE_API
-#define epicsExportSharedSymbols
 #include "dbDefs.h"
 #include "epicsEvent.h"
 #include "iocLog.h"
@@ -198,7 +197,7 @@ static void sendMessageChunk(logClient * pClient, const char * message) {
 /*
  * logClientSend ()
  */
-void epicsShareAPI logClientSend ( logClientId id, const char * message )
+void epicsStdCall logClientSend ( logClientId id, const char * message )
 {
     logClient * pClient = ( logClient * ) id;
 
@@ -217,7 +216,7 @@ void epicsShareAPI logClientSend ( logClientId id, const char * message )
 }
 
 
-void epicsShareAPI logClientFlush ( logClientId id )
+void epicsStdCall logClientFlush ( logClientId id )
 {
     unsigned nSent;
     int status = 0;
@@ -451,7 +450,7 @@ static void logClientRestart ( logClientId id )
 /*
  *  logClientCreate()
  */
-logClientId epicsShareAPI logClientCreate (
+logClientId epicsStdCall logClientCreate (
     struct in_addr server_addr, unsigned short server_port)
 {
     logClient *pClient;
@@ -514,7 +513,7 @@ logClientId epicsShareAPI logClientCreate (
 /*
  * logClientShow ()
  */
-void epicsShareAPI logClientShow (logClientId id, unsigned level)
+void epicsStdCall logClientShow (logClientId id, unsigned level)
 {
     logClient *pClient = (logClient *) id;
 
@@ -547,7 +546,7 @@ void epicsShareAPI logClientShow (logClientId id, unsigned level)
 /*
  * iocLogPrefix()
  */
-void epicsShareAPI iocLogPrefix(const char * prefix)
+void epicsStdCall iocLogPrefix(const char * prefix)
 {
 
     /* If we have already established a log prefix, don't let the user change

modules/libcom/src/log/logClient.h

@@ -17,7 +17,7 @@
 
 #ifndef INClogClienth
 #define INClogClienth 1
-#include "shareLib.h"
+#include "libComAPI.h"
 #include "osiSock.h" /* for 'struct in_addr' */
 
 /* include default log client interface for backward compatibility */
@@ -28,16 +28,16 @@ extern "C" {
 #endif
 
 typedef void *logClientId;
-epicsShareFunc logClientId epicsShareAPI logClientCreate (
+LIBCOM_API logClientId epicsStdCall logClientCreate (
     struct in_addr server_addr, unsigned short server_port);
-epicsShareFunc void epicsShareAPI logClientSend (logClientId id, const char *message);
-epicsShareFunc void epicsShareAPI logClientShow (logClientId id, unsigned level);
-epicsShareFunc void epicsShareAPI logClientFlush (logClientId id);
-epicsShareFunc void epicsShareAPI iocLogPrefix(const char* prefix);
+LIBCOM_API void epicsStdCall logClientSend (logClientId id, const char *message);
+LIBCOM_API void epicsStdCall logClientShow (logClientId id, unsigned level);
+LIBCOM_API void epicsStdCall logClientFlush (logClientId id);
+LIBCOM_API void epicsStdCall iocLogPrefix(const char* prefix);
 
 /* deprecated interface; retained for backward compatibility */
 /* note: implementations are in iocLog.c, not logClient.c */
-epicsShareFunc logClientId epicsShareAPI logClientInit (void);
+LIBCOM_API logClientId epicsStdCall logClientInit (void);
 
 #ifdef __cplusplus
 }