From 8723d4d9cb90dfd4894ddb16a5695d8166093aaa Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Fri, 5 Feb 2021 13:30:33 -0800 Subject: [PATCH] include database S_* in error string table --- modules/database/src/ioc/db/dbAccessDefs.h | 3 +-- modules/libcom/src/error/Makefile | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/database/src/ioc/db/dbAccessDefs.h b/modules/database/src/ioc/db/dbAccessDefs.h index 5715df35d..f2cf091a3 100644 --- a/modules/database/src/ioc/db/dbAccessDefs.h +++ b/modules/database/src/ioc/db/dbAccessDefs.h @@ -173,9 +173,8 @@ struct dbr_alDouble {DBRalDouble}; #define dbr_alLong_size sizeof(struct dbr_alLong) #define dbr_alDouble_size sizeof(struct dbr_alDouble) -#ifndef INCerrMdefh #include "errMdef.h" -#endif + #define S_db_notFound (M_dbAccess| 1) /*Process Variable Not Found*/ #define S_db_badDbrtype (M_dbAccess| 3) /*Illegal Database Request Type*/ #define S_db_noMod (M_dbAccess| 5) /*Attempt to modify noMod field*/ diff --git a/modules/libcom/src/error/Makefile b/modules/libcom/src/error/Makefile index c79752cc3..570974b95 100644 --- a/modules/libcom/src/error/Makefile +++ b/modules/libcom/src/error/Makefile @@ -26,5 +26,7 @@ ERR_S_FILES += $(LIBCOM)/as/asLib.h ERR_S_FILES += $(LIBCOM)/misc/epicsStdlib.h ERR_S_FILES += $(LIBCOM)/pool/epicsThreadPool.h ERR_S_FILES += $(LIBCOM)/error/errMdef.h +ERR_S_FILES += $(TOP)/modules/database/src/ioc/db/dbAccessDefs.h +ERR_S_FILES += $(TOP)/modules/database/src/ioc/dbStatic/dbStaticLib.h CLEANS += errSymTbl.c