libCom: actually use libComAPI.h in libCom

modules/database/src/ioc/db/callback.c

@@ -65,7 +65,7 @@ static cbQueueSet callbackQueue[NUM_CALLBACK_PRIORITIES];
 int callbackThreadsDefault = 1;
 /* Don't know what a reasonable default is (yet).
  * For the time being: parallel means 2 if not explicitly specified */
-epicsShareDef int callbackParallelThreadsDefault = 2;
+int callbackParallelThreadsDefault = 2;
 epicsExportAddress(int,callbackParallelThreadsDefault);
 
 /* Timer for Delayed Requests */

modules/database/src/ioc/db/dbAccess.c

@@ -62,15 +62,15 @@
 #include "recSup.h"
 #include "special.h"
 
-epicsShareDef struct dbBase *pdbbase = 0;
-epicsShareDef volatile int interruptAccept=FALSE;
+struct dbBase *pdbbase = 0;
+volatile int interruptAccept=FALSE;
 
-epicsShareDef int dbAccessDebugPUTF = 0;
+int dbAccessDebugPUTF = 0;
 epicsExportAddress(int, dbAccessDebugPUTF);
 
 /* Hook Routines */
 
-epicsShareDef DB_LOAD_RECORDS_HOOK_ROUTINE dbLoadRecordsHook = NULL;
+DB_LOAD_RECORDS_HOOK_ROUTINE dbLoadRecordsHook = NULL;
 
 static short mapDBFToDBR[DBF_NTYPES] = {
     /* DBF_STRING   => */    DBR_STRING,

modules/database/src/ioc/db/dbConvert.c

@@ -1704,7 +1704,7 @@ static long putEnumEnum PUT_NOCONVERT(epicsEnum16, epicsEnum16)
  DBR_FLOAT,       DBR_DOUBLE,      DBR_ENUM
  ***************************************************************************/
 
-epicsShareDef GETCONVERTFUNC dbGetConvertRoutine[DBF_DEVICE+1][DBR_ENUM+1] = {
+GETCONVERTFUNC dbGetConvertRoutine[DBF_DEVICE+1][DBR_ENUM+1] = {
 
 /* source is a DBF_STRING               */
 {getStringString, getStringChar,   getStringUchar,  getStringShort,  getStringUshort,
@@ -1775,7 +1775,7 @@ epicsShareDef GETCONVERTFUNC dbGetConvertRoutine[DBF_DEVICE+1][DBR_ENUM+1] = {
  DBF_MENU,        DBF_DEVICE
  ***************************************************************************/
 
-epicsShareDef PUTCONVERTFUNC dbPutConvertRoutine[DBR_ENUM+1][DBF_DEVICE+1] = {
+PUTCONVERTFUNC dbPutConvertRoutine[DBR_ENUM+1][DBF_DEVICE+1] = {
 /* source is a DBR_STRING               */
 {putStringString, putStringChar,   putStringUchar,  putStringShort,  putStringUshort,
  putStringLong,   putStringUlong,  putStringInt64,  putStringUInt64,

modules/database/src/ioc/db/dbFastLinkConv.c

@@ -1390,7 +1390,7 @@ static long cvt_device_st(
  *  NULL implies the conversion is not supported.
  */
 
-epicsShareDef long (*dbFastGetConvertRoutine[DBF_DEVICE+1][DBR_ENUM+1])() = {
+long (*dbFastGetConvertRoutine[DBF_DEVICE+1][DBR_ENUM+1])() = {
 
  /* Convert DBF_STRING to ... */
 { cvt_st_st, cvt_st_c, cvt_st_uc, cvt_st_s, cvt_st_us, cvt_st_l, cvt_st_ul, cvt_st_q, cvt_st_uq, cvt_st_f, cvt_st_d, cvt_st_e },
@@ -1446,7 +1446,7 @@ epicsShareDef long (*dbFastGetConvertRoutine[DBF_DEVICE+1][DBR_ENUM+1])() = {
  *  NULL implies the conversion is not supported.
  */
 
-epicsShareDef long (*dbFastPutConvertRoutine[DBR_ENUM+1][DBF_DEVICE+1])() = {
+long (*dbFastPutConvertRoutine[DBR_ENUM+1][DBF_DEVICE+1])() = {
 
  /* Convert DBR_STRING to ... */
 { cvt_st_st, cvt_st_c, cvt_st_uc, cvt_st_s, cvt_st_us, cvt_st_l, cvt_st_ul, cvt_st_q, cvt_st_uq, cvt_st_f, cvt_st_d, cvt_st_e, cvt_st_menu, cvt_st_device},

modules/database/src/ioc/db/db_convert.h

@@ -40,7 +40,7 @@ epicsShareExtern long (*dbFastPutConvertRoutine[newDBR_ENUM+1][newDBF_DEVICE+1])
 epicsShareExtern unsigned short dbDBRoldToDBFnew[DBR_DOUBLE+1];
 epicsShareExtern unsigned short dbDBRnewToDBRold[newDBR_ENUM+1];
 #ifdef DB_CONVERT_GBLSOURCE
-epicsShareDef unsigned short dbDBRoldToDBFnew[DBR_DOUBLE+1] = {
+unsigned short dbDBRoldToDBFnew[DBR_DOUBLE+1] = {
 	0, /*DBR_STRING to DBF_STRING*/
 	3, /*DBR_INT to DBF_SHORT*/
 	9, /*DBR_FLOAT to DBF_FLOAT*/
@@ -49,7 +49,7 @@ epicsShareDef unsigned short dbDBRoldToDBFnew[DBR_DOUBLE+1] = {
 	5, /*DBR_LONG to DBF_LONG*/
 	10  /*DBR_DOUBLE to DBF_DOUBLE*/
 };
-epicsShareDef unsigned short dbDBRnewToDBRold[newDBR_ENUM+1] = {
+unsigned short dbDBRnewToDBRold[newDBR_ENUM+1] = {
 	0, /*DBR_STRING to DBR_STRING*/
 	4, /*DBR_CHAR to DBR_CHAR*/
 	4, /*DBR_UCHAR to DBR_CHAR*/

modules/database/src/ioc/db/recGbl.c

@@ -48,7 +48,7 @@
 
 /* Hook Routines */
 
-epicsShareDef RECGBL_ALARM_HOOK_ROUTINE recGblAlarmHook = NULL;
+RECGBL_ALARM_HOOK_ROUTINE recGblAlarmHook = NULL;
 
 /* local routines */
 static void getMaxRangeValues(short field_type, double *pupper_limit,

modules/database/src/ioc/dbStatic/dbFldTypes.h

@@ -50,7 +50,7 @@ typedef struct mapdbfType{
 
 epicsShareExtern mapdbfType pamapdbfType[];
 #ifdef DBFLDTYPES_GBLSOURCE
-epicsShareDef mapdbfType pamapdbfType[DBF_NTYPES] = {
+mapdbfType pamapdbfType[DBF_NTYPES] = {
 	{"DBF_STRING",DBF_STRING},
 	{"DBF_CHAR",DBF_CHAR},
 	{"DBF_UCHAR",DBF_UCHAR},

modules/database/src/ioc/dbStatic/dbLexRoutines.c

@@ -40,18 +40,18 @@
 
 
 /*global declarations*/
-epicsShareDef char *makeDbdDepends=0;
+char *makeDbdDepends=0;
 
-epicsShareDef int dbRecordsOnceOnly=0;
+int dbRecordsOnceOnly=0;
 epicsExportAddress(int,dbRecordsOnceOnly);
 
-epicsShareDef int dbBptNotMonotonic=0;
+int dbBptNotMonotonic=0;
 epicsExportAddress(int,dbBptNotMonotonic);
 
-epicsShareDef int dbQuietMacroWarnings=0;
+int dbQuietMacroWarnings=0;
 epicsExportAddress(int,dbQuietMacroWarnings);
 
-epicsShareDef int dbRecordsAbcSorted=0;
+int dbRecordsAbcSorted=0;
 epicsExportAddress(int,dbRecordsAbcSorted);
 
 /*private routines */

modules/database/src/ioc/dbStatic/dbStaticLib.c

@@ -60,7 +60,7 @@ STATIC_ASSERT(messagesize >= 21);
 static char *ppstring[5]={" NPP"," PP"," CA"," CP"," CPP"};
 static char *msstring[4]={" NMS"," MS"," MSI"," MSS"};
 
-epicsShareDef maplinkType pamaplinkType[LINK_NTYPES] = {
+maplinkType pamaplinkType[LINK_NTYPES] = {
 	{"CONSTANT",CONSTANT},
 	{"PV_LINK",PV_LINK},
 	{"VME_IO",VME_IO},

modules/database/src/ioc/dbStatic/dbStaticRun.c

@@ -31,7 +31,7 @@
 #include "devSup.h"
 #include "special.h"
 
-epicsShareDef int dbConvertStrict = 0;
+int dbConvertStrict = 0;
 epicsExportAddress(int, dbConvertStrict);
 
 static long do_nothing(struct dbCommon *precord) { return 0; }