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/exampleDatabase/src/exampleDatabaseRegister.cpp
+++ b/exampleDatabase/src/exampleDatabaseRegister.cpp
@@ -58,4 +58,7 @@ static void exampleDatabaseRegister(void)
        iocshRegister(&exampleDatabaseFuncDef, exampleDatabaseCallFunc);
    }
 }
-epicsExportRegistrar(exampleDatabaseRegister);
+
+extern "C" {
+    epicsExportRegistrar(exampleDatabaseRegister);
+}