diff --git a/lib/TH/THDiskFile.c b/lib/TH/THDiskFile.c index 19cec8f7..2ded7bd9 100644 --- a/lib/TH/THDiskFile.c +++ b/lib/TH/THDiskFile.c @@ -384,7 +384,8 @@ static size_t THDiskFile_readLong(THFile *self, long *data, size_t n) nread = fread__(data, 4, n, dfself->handle); if(!dfself->isNativeEncoding && (nread > 0)) THDiskFile_reverseMemory(data, data, 4, nread); - for(size_t i = nread; i > 0; i--) + size_t i; + for(i = nread; i > 0; i--) data[i-1] = ((int *)data)[i-1]; } else /* if(dfself->longSize == 8) */ @@ -392,7 +393,8 @@ static size_t THDiskFile_readLong(THFile *self, long *data, size_t n) int big_endian = !THDiskFile_isLittleEndianCPU(); int32_t *buffer = THAlloc(8*n); nread = fread__(buffer, 8, n, dfself->handle); - for(size_t i = nread; i > 0; i--) + size_t i; + for(i = nread; i > 0; i--) data[i-1] = buffer[2*(i-1) + big_endian]; THFree(buffer); if(!dfself->isNativeEncoding && (nread > 0)) @@ -450,7 +452,8 @@ static size_t THDiskFile_writeLong(THFile *self, long *data, size_t n) } else if(dfself->longSize == 4) { int32_t *buffer = THAlloc(4*n); - for(size_t i = 0; i < n; i++) + size_t i; + for(i = 0; i < n; i++) buffer[i] = data[i]; if(!dfself->isNativeEncoding) THDiskFile_reverseMemory(buffer, buffer, 4, n); @@ -461,7 +464,8 @@ static size_t THDiskFile_writeLong(THFile *self, long *data, size_t n) { int big_endian = !THDiskFile_isLittleEndianCPU(); int32_t *buffer = THAlloc(8*n); - for(size_t i = 0; i < n; i++) + size_t i; + for(i = 0; i < n; i++) { buffer[2*i + !big_endian] = 0; buffer[2*i + big_endian] = data[i]; diff --git a/lib/TH/THMemoryFile.c b/lib/TH/THMemoryFile.c index 92860591..8d976212 100644 --- a/lib/TH/THMemoryFile.c +++ b/lib/TH/THMemoryFile.c @@ -375,7 +375,8 @@ static size_t THMemoryFile_readLong(THFile *self, long *data, size_t n) size_t nByteRemaining = (mfself->position + nByte <= mfself->size ? nByte : mfself->size-mfself->position); int32_t *storage = (int32_t *)(mfself->storage->data + mfself->position); nread = nByteRemaining/4; - for(size_t i = 0; i < nread; i++) + size_t i; + for(i = 0; i < nread; i++) data[i] = storage[i]; mfself->position += nread*4; } @@ -386,7 +387,8 @@ static size_t THMemoryFile_readLong(THFile *self, long *data, size_t n) int32_t *storage = (int32_t *)(mfself->storage->data + mfself->position); size_t nByteRemaining = (mfself->position + nByte <= mfself->size ? nByte : mfself->size-mfself->position); nread = nByteRemaining/8; - for(size_t i = 0; i < nread; i++) + size_t i; + for(i = 0; i < nread; i++) data[i] = storage[2*i + big_endian]; mfself->position += nread*8; } @@ -450,7 +452,8 @@ static size_t THMemoryFile_writeLong(THFile *self, long *data, size_t n) size_t nByte = 4*n; THMemoryFile_grow(mfself, mfself->position+nByte); int32_t *storage = (int32_t *)(mfself->storage->data + mfself->position); - for(size_t i = 0; i < n; i++) + size_t i; + for(i = 0; i < n; i++) storage[i] = data[i]; mfself->position += nByte; } @@ -460,7 +463,8 @@ static size_t THMemoryFile_writeLong(THFile *self, long *data, size_t n) size_t nByte = 8*n; THMemoryFile_grow(mfself, mfself->position+nByte); int32_t *storage = (int32_t *)(mfself->storage->data + mfself->position); - for(size_t i = 0; i < n; i++) + size_t i; + for(i = 0; i < n; i++) { storage[2*i + !big_endian] = 0; storage[2*i + big_endian] = data[i];