Merge branch 'maverick' into develop

Compile under OSX
2016-01-26 09:48:11 +01:00
parent f0021db2ff cdb9a8fba2
commit 5e597e2d10
46 changed files with 174 additions and 194 deletions
--- a/multicounter.c
+++ b/multicounter.c
@ -123,7 +123,7 @@ static int MMCCStart(void *pData, SConnection * pCon)

 static int MMCCStatus(void *pData, SConnection * pCon)
 {
-  int status, i;
+  int status = HWIdle, i;
  pCounter pCount = NULL, pMaster = NULL;;
  pMultiCounter self = NULL;
  pDummy pDum = NULL;