Merge ~epics-core/epics-base/+git/fixups:move_initHooks into ~epics-core/epics-base/+git/epics-base:7.0

[mdavidsaver]

Move initHooks.h from libdbCore -> libCom. This will allow libpvAccessIOC to be merged into libpvAccess

[mdavidsaver (mdavidsaver)]

Simple now that the re-merge is done!

[Andrew Johnson (anj)]

Core Group review at ESS:

Looks good, merge.

review: Approve

diff --git a/modules/database/src/ioc/db/Makefile b/modules/database/src/ioc/db/Makefile
index d28119f..c6f3355 100644
--- a/modules/database/src/ioc/db/Makefile
+++ b/modules/database/src/ioc/db/Makefile
@@ -35,7 +35,6 @@ INC += dbTest.h
 INC += dbCaTest.h
 INC += db_test.h
 INC += db_field_log.h
-INC += initHooks.h
 INC += recGbl.h
 INC += dbIocRegister.h
 INC += chfPlugin.h
@@ -86,7 +85,6 @@ dbCore_SRCS += recGbl.c
 dbCore_SRCS += callback.c
 dbCore_SRCS += dbCa.c
 dbCore_SRCS += dbCaTest.c
-dbCore_SRCS += initHooks.c
 dbCore_SRCS += cvtBpt.c
 dbCore_SRCS += dbContext.cpp
 dbCore_SRCS += dbChannelIO.cpp
diff --git a/modules/libcom/src/iocsh/Makefile b/modules/libcom/src/iocsh/Makefile
index 7665773..274b02b 100644
--- a/modules/libcom/src/iocsh/Makefile
+++ b/modules/libcom/src/iocsh/Makefile
@@ -9,8 +9,10 @@
 
 SRC_DIRS += $(LIBCOM)/iocsh
 INC += iocsh.h
+INC += initHooks.h
 INC += registry.h
 INC += libComRegister.h
 Com_SRCS += iocsh.cpp
+Com_SRCS += initHooks.c
 Com_SRCS += registry.c
 Com_SRCS += libComRegister.c
diff --git a/modules/database/src/ioc/db/initHooks.c b/modules/libcom/src/iocsh/initHooks.c
index 9070c53..0884bdd 100644
--- a/modules/database/src/ioc/db/initHooks.c
+++ b/modules/libcom/src/iocsh/initHooks.c
@@ -16,12 +16,12 @@
 #include <stddef.h>
 #include <stdio.h>
 
+#define epicsExportSharedSymbols
 #include "dbDefs.h"
 #include "ellLib.h"
 #include "epicsMutex.h"
 #include "epicsThread.h"
 
-#define epicsExportSharedSymbols
 #include "initHooks.h"
 
 typedef struct initHookLink {
diff --git a/modules/database/src/ioc/db/initHooks.h b/modules/libcom/src/iocsh/initHooks.h
index 429a768..429a768 100644
--- a/modules/database/src/ioc/db/initHooks.h
+++ b/modules/libcom/src/iocsh/initHooks.h
diff --git a/modules/pvAccess b/modules/pvAccess
index 51fdd50..a413f8f 160000
--- a/modules/pvAccess
+++ b/modules/pvAccess
@@ -1 +1 @@
-Subproject commit 51fdd506d04e036ff85707b615a87bec605e4279
+Subproject commit a413f8f9db23f3b7e1ad34ed76977912cd9de7d1
diff --git a/modules/pvData b/modules/pvData
index 499c032..a1c0e43 160000
--- a/modules/pvData
+++ b/modules/pvData
@@ -1 +1 @@
-Subproject commit 499c03265fb9d88aa1ccc2f0cf25ee0ebd46aa9a
+Subproject commit a1c0e432ee605c8abaa8f34185503c2886e12545
diff --git a/modules/pva2pva b/modules/pva2pva
index 8db7a4a..a4f3571 160000
--- a/modules/pva2pva
+++ b/modules/pva2pva
@@ -1 +1 @@
-Subproject commit 8db7a4a75e7f573351332d37a8707b89f3e2474f
+Subproject commit a4f35714a0865ec93e16e8238d56f7e456cf7ddc