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/fourmess.c
+++ b/fourmess.c
@ -393,7 +393,7 @@ static int FourMessStoreIntern(pSICSOBJ self, SConnection * pCon,
                               double fHkl[3], double fPosition[4], char *extra)
 {
  pFourMess priv = self->pPrivate;
-  float fSum, fSigma, fTemp, fStep, fPreset;
+  float fSum, fSigma, fTemp, fStep = .0, fPreset =.0;
  int i, iLF, iRet, iNP, ii;
  long *lCounts = NULL;
  pEVControl pEva = NULL;