Merged changes from default branch

2014-04-18 17:54:35 -05:00
parent 5faa9902ea 83f2fa9d9a
commit 69fe610c5d
5 changed files with 19 additions and 5 deletions
--- a/exampleLink/src/exampleLinkRegister.cpp
+++ b/exampleLink/src/exampleLinkRegister.cpp
@@ -83,4 +83,7 @@ static void exampleLinkRegister(void)
        iocshRegister(&exampleLinkFuncDef, exampleLinkCallFunc);
    }
 }
-epicsExportRegistrar(exampleLinkRegister);
+
+extern "C" {
+    epicsExportRegistrar(exampleLinkRegister);
+}