epicsShare macro fixes from Mark Rivers (copied from the main trunk).
This commit is contained in:
@@ -15,6 +15,8 @@
|
||||
#ifndef INCdbFldTypesh
|
||||
#define INCdbFldTypesh 1
|
||||
|
||||
#include "shareLib.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
@@ -45,10 +47,9 @@ typedef struct mapdbfType{
|
||||
dbfType value;
|
||||
}mapdbfType;
|
||||
|
||||
#ifndef DBFLDTYPES_GBLSOURCE
|
||||
extern mapdbfType pamapdbfType[];
|
||||
#else
|
||||
mapdbfType pamapdbfType[DBF_NTYPES] = {
|
||||
epicsShareExtern mapdbfType pamapdbfType[];
|
||||
#ifdef DBFLDTYPES_GBLSOURCE
|
||||
epicsShareDef mapdbfType pamapdbfType[DBF_NTYPES] = {
|
||||
{"DBF_STRING",DBF_STRING},
|
||||
{"DBF_CHAR",DBF_CHAR},
|
||||
{"DBF_UCHAR",DBF_UCHAR},
|
||||
|
||||
@@ -22,7 +22,6 @@
|
||||
#define GUIGROUPS_GBLSOURCE
|
||||
#define SPECIAL_GBLSOURCE
|
||||
#include "dbDefs.h"
|
||||
#include "dbFldTypes.h"
|
||||
#include "epicsPrint.h"
|
||||
#include "errlog.h"
|
||||
#include "ellLib.h"
|
||||
@@ -36,6 +35,7 @@
|
||||
|
||||
#define epicsExportSharedSymbols
|
||||
#include "link.h"
|
||||
#include "dbFldTypes.h"
|
||||
#include "devSup.h"
|
||||
#include "drvSup.h"
|
||||
#include "special.h"
|
||||
|
||||
Reference in New Issue
Block a user