Merge branch 'release-4-5-patches' into release-4-6

[alexxy/gromacs.git] / src / mdlib / edsam.c

diff --git a/src/mdlib/edsam.c b/src/mdlib/edsam.c
index c629ec60d39a173c251522cc2628f14d2eaaa548..15fdd6873b416f23058f858bd719c56cc4e94f4d 100644 (file)
--- a/src/mdlib/edsam.c
+++ b/src/mdlib/edsam.c
@@ -46,7 +46,7 @@
 #include "mvdata.h"
 #include "txtdump.h"
 #include "vec.h"
-#include "time.h"
+#include <time.h>
 #include "nrnb.h"
 #include "mshift.h"
 #include "mdrun.h"
@@ -1500,9 +1500,7 @@ static int read_edi(FILE* in, gmx_edsam_t ed,t_edpar *edi,int nr_mdatoms, int ed
     {
         if (readmagic==666 || readmagic==667 || readmagic==668)
             gmx_fatal(FARGS,"Wrong magic number: Use newest version of make_edi to produce edi file");
-        else if (readmagic == 669)
-            ;
-        else
+        else if (readmagic != 669)
             gmx_fatal(FARGS,"Wrong magic number %d in %s",readmagic,ed->edinam);
     }