Merged changes from default branch

exampleDatabase/src/exampleDatabaseRegister.cpp

@@ -58,4 +58,7 @@ static void exampleDatabaseRegister(void)
         iocshRegister(&exampleDatabaseFuncDef, exampleDatabaseCallFunc);
     }
 }
-epicsExportRegistrar(exampleDatabaseRegister);
+
+extern "C" {
+    epicsExportRegistrar(exampleDatabaseRegister);
+}

exampleLink/src/exampleLinkRegister.cpp

@@ -83,4 +83,7 @@ static void exampleLinkRegister(void)
         iocshRegister(&exampleLinkFuncDef, exampleLinkCallFunc);
     }
 }
-epicsExportRegistrar(exampleLinkRegister);
+
+extern "C" {
+    epicsExportRegistrar(exampleLinkRegister);
+}

exampleServer/src/exampleServerRegister.cpp

@@ -65,4 +65,7 @@ static void exampleServerRegister(void)
         iocshRegister(&exampleServerFuncDef, exampleServerCallFunc);
     }
 }
-epicsExportRegistrar(exampleServerRegister);
+
+extern "C" {
+    epicsExportRegistrar(exampleServerRegister);
+}

src/pvAccess/registerChannelProviderLocal.cpp

@@ -61,4 +61,6 @@ static void registerChannelProviderLocal(void)
     }
 }
 
-epicsExportRegistrar(registerChannelProviderLocal);
+extern "C" {
+    epicsExportRegistrar(registerChannelProviderLocal);
+}

testTop/src/powerSupplyRegister.cpp

@@ -67,4 +67,7 @@ static void powerSupplyRegister(void)
         iocshRegister(&powerSupplyFuncDef, powerSupplyCallFunc);
     }
 }
-epicsExportRegistrar(powerSupplyRegister);
+
+extern "C" {
+    epicsExportRegistrar(powerSupplyRegister);
+}