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/exampleServer/src/exampleServerRegister.cpp
+++ b/exampleServer/src/exampleServerRegister.cpp
@@ -65,4 +65,7 @@ static void exampleServerRegister(void)
        iocshRegister(&exampleServerFuncDef, exampleServerCallFunc);
    }
 }
-epicsExportRegistrar(exampleServerRegister);
+
+extern "C" {
+    epicsExportRegistrar(exampleServerRegister);
+}