From 3259a396aa65df4e4fd460f0cb12f8f235f22bd1 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Fri, 18 Apr 2014 16:40:38 -0500
Subject: [PATCH] epicsExportRegistrar() must be inside extern "C" block

---
 pvAccessApp/v3ioc/PVAClientRegister.cpp | 7 ++++---
 pvAccessApp/v3ioc/PVAServerRegister.cpp | 6 ++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/pvAccessApp/v3ioc/PVAClientRegister.cpp b/pvAccessApp/v3ioc/PVAClientRegister.cpp
index ccef6c4..b2587be 100644
--- a/pvAccessApp/v3ioc/PVAClientRegister.cpp
+++ b/pvAccessApp/v3ioc/PVAClientRegister.cpp
@@ -67,6 +67,7 @@ static void stopPVAClientRegister(void)
     }
 }
 
-
-epicsExportRegistrar(startPVAClientRegister);
-epicsExportRegistrar(stopPVAClientRegister);
+extern "C" {
+    epicsExportRegistrar(startPVAClientRegister);
+    epicsExportRegistrar(stopPVAClientRegister);
+}
diff --git a/pvAccessApp/v3ioc/PVAServerRegister.cpp b/pvAccessApp/v3ioc/PVAServerRegister.cpp
index 837f5b4..620af8a 100644
--- a/pvAccessApp/v3ioc/PVAServerRegister.cpp
+++ b/pvAccessApp/v3ioc/PVAServerRegister.cpp
@@ -125,5 +125,7 @@ static void stopPVAServerRegister(void)
     }
 }
 
-epicsExportRegistrar(startPVAServerRegister);
-epicsExportRegistrar(stopPVAServerRegister);
+extern "C" {
+    epicsExportRegistrar(startPVAServerRegister);
+    epicsExportRegistrar(stopPVAServerRegister);
+}