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/sctcomtask.c
+++ b/sctcomtask.c
@@ -27,7 +27,7 @@
 #include "sicsutil.h"
 #include "sicshipadaba.h"

-static unsigned int mamaID = 0L;
+static  int mamaID = 0L;

 extern char *ParText(Hdb * cmdNode, char *name,
                     int nPar, char *defaultValue);