diff options
| author | Daniel Spangberg <daniels@kemi.uu.se> | 2013-05-17 18:17:17 (GMT) |
|---|---|---|
| committer | Daniel Spangberg <daniels@kemi.uu.se> | 2013-05-17 18:17:17 (GMT) |
| commit | 494702b3a59f3670af8da7acf7e8baf6ae4f7dd4 (patch) | |
| tree | 7724580fa811ff7f02c95eb3e79fc74798e0f27a /src/tests/compression/testsuite.c | |
| parent | 47bc4acb6a7373a359b3b3a73302ebd985dedd1b (diff) | |
Fix errors introduced when doing if(UNIX) in CMakeLists.txt
Fix declaration of variables not at beginning of scope (breaks C89) in tng compress testsuite.
Diffstat (limited to 'src/tests/compression/testsuite.c')
| -rw-r--r-- | src/tests/compression/testsuite.c | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/src/tests/compression/testsuite.c b/src/tests/compression/testsuite.c index 3ed9f32..27450d6 100644 --- a/src/tests/compression/testsuite.c +++ b/src/tests/compression/testsuite.c @@ -782,28 +782,32 @@ static int algotest() write_tng_file(dumpfile,box1,velbox1); #else /* GEN */ #ifdef INTTOFLOAT - unsigned long prec_hi, prec_lo; - unsigned long velprec_hi, velprec_lo; - readreturn=read_tng_file_int(dumpfile,intbox,intvelbox,&prec_hi,&prec_lo,&velprec_hi,&velprec_lo); - if (!readreturn) - { - tng_compress_int_to_float(intbox,prec_hi,prec_lo,NATOMS,1,box2); + { + unsigned long prec_hi, prec_lo; + unsigned long velprec_hi, velprec_lo; + readreturn=read_tng_file_int(dumpfile,intbox,intvelbox,&prec_hi,&prec_lo,&velprec_hi,&velprec_lo); + if (!readreturn) + { + tng_compress_int_to_float(intbox,prec_hi,prec_lo,NATOMS,1,box2); #if WRITEVEL - tng_compress_int_to_float(intvelbox,velprec_hi,velprec_lo,NATOMS,1,velbox2); + tng_compress_int_to_float(intvelbox,velprec_hi,velprec_lo,NATOMS,1,velbox2); #endif - } + } + } #else /* INTTOFLOAT */ #ifdef INTTODOUBLE - unsigned long prec_hi, prec_lo; - unsigned long velprec_hi, velprec_lo; - readreturn=read_tng_file_int(dumpfile,intbox,intvelbox,&prec_hi,&prec_lo,&velprec_hi,&velprec_lo); - if (!readreturn) - { - tng_compress_int_to_double(intbox,prec_hi,prec_lo,NATOMS,1,box2); + { + unsigned long prec_hi, prec_lo; + unsigned long velprec_hi, velprec_lo; + readreturn=read_tng_file_int(dumpfile,intbox,intvelbox,&prec_hi,&prec_lo,&velprec_hi,&velprec_lo); + if (!readreturn) + { + tng_compress_int_to_double(intbox,prec_hi,prec_lo,NATOMS,1,box2); #if WRITEVEL - tng_compress_int_to_double(intvelbox,velprec_hi,velprec_lo,NATOMS,1,velbox2); + tng_compress_int_to_double(intvelbox,velprec_hi,velprec_lo,NATOMS,1,velbox2); #endif - } + } + } #else /* INTTODOUBLE */ readreturn=read_tng_file(dumpfile,box2,velbox2); #endif /* INTTODOUBLE */ |