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
@@ -67,4 +67,7 @@ static void powerSupplyRegister(void)
        iocshRegister(&powerSupplyFuncDef, powerSupplyCallFunc);
    }
 }
-epicsExportRegistrar(powerSupplyRegister);
+
+extern "C" {
+    epicsExportRegistrar(powerSupplyRegister);
+}