From da5455ed222ddee097dc9b994898e74d9b10ddd6 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Fri, 9 Sep 2016 11:14:59 -0500 Subject: [PATCH] Fixes for Windows builds --- src/ioc/db/dbConvertJSON.c | 2 +- src/ioc/db/dbJLink.c | 3 +-- src/ioc/dbStatic/dbStaticPvt.h | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/ioc/db/dbConvertJSON.c b/src/ioc/db/dbConvertJSON.c index 14a48866f..c0e1e2c8e 100644 --- a/src/ioc/db/dbConvertJSON.c +++ b/src/ioc/db/dbConvertJSON.c @@ -14,7 +14,7 @@ #include "yajl_alloc.h" #include "yajl_parse.h" -#define epicsExportSharedSybols +#define epicsExportSharedSymbols #include "dbAccessDefs.h" #include "dbConvertFast.h" diff --git a/src/ioc/db/dbJLink.c b/src/ioc/db/dbJLink.c index c350a5155..5638e73ee 100644 --- a/src/ioc/db/dbJLink.c +++ b/src/ioc/db/dbJLink.c @@ -11,12 +11,11 @@ #include "epicsAssert.h" #include "dbmf.h" -#include "dbStaticLib.h" #include "errlog.h" #include "yajl_alloc.h" #include "yajl_parse.h" -#define epicsExportSharedSybols +#define epicsExportSharedSymbols #include "dbAccessDefs.h" #include "dbCommon.h" #include "dbLink.h" diff --git a/src/ioc/dbStatic/dbStaticPvt.h b/src/ioc/dbStatic/dbStaticPvt.h index 41a37429a..372fd54bf 100644 --- a/src/ioc/dbStatic/dbStaticPvt.h +++ b/src/ioc/dbStatic/dbStaticPvt.h @@ -16,8 +16,6 @@ #ifndef INCdbStaticPvth #define INCdbStaticPvth 1 -#include "dbJLink.h" - #ifdef __cplusplus extern "C" { #endif @@ -38,6 +36,8 @@ char *dbRecordName(DBENTRY *pdbentry); char *dbGetStringNum(DBENTRY *pdbentry); long dbPutStringNum(DBENTRY *pdbentry,const char *pstring); +struct jlink; + typedef struct dbLinkInfo { short ltype; @@ -54,7 +54,7 @@ typedef struct dbLinkInfo { int hwnums[5]; /* for JSON_LINK */ - jlink *jlink; + struct jlink *jlink; } dbLinkInfo; long dbInitRecordLinks(dbRecordType *rtyp, struct dbCommon *prec);