From a74a41b93212da050562ce7590239c6a6752b2e9 Mon Sep 17 00:00:00 2001
From: Mathieu Malaterre <mathieu.malaterre@gmail.com>
Date: Wed, 11 Jul 2012 15:07:05 +0000
Subject: [PATCH] [1.5] Fix compilation issue with Compiler Borland C++ v. 5.5

Fixes issue 154
---
 libopenjpeg/cio.c | 2 +-
 libopenjpeg/cio.h | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/libopenjpeg/cio.c b/libopenjpeg/cio.c
index b8a7ecf8..c0cb0282 100644
--- a/libopenjpeg/cio.c
+++ b/libopenjpeg/cio.c
@@ -152,7 +152,7 @@ unsigned char cio_bytein(opj_cio_t *cio) {
  * v : value to write
  * n : number of bytes to write
  */
-unsigned int cio_write(opj_cio_t *cio, unsigned long long int v, int n) {
+unsigned int cio_write(opj_cio_t *cio, unsigned int64 v, int n) {
 	int i;
 	for (i = n - 1; i >= 0; i--) {
 		if( !cio_byteout(cio, (unsigned char) ((v >> (i << 3)) & 0xff)) )
diff --git a/libopenjpeg/cio.h b/libopenjpeg/cio.h
index ce1a13ec..e6274314 100644
--- a/libopenjpeg/cio.h
+++ b/libopenjpeg/cio.h
@@ -31,6 +31,13 @@
 
 #ifndef __CIO_H
 #define __CIO_H
+
+#if defined(_MSC_VER) || defined(__BORLANDC__)
+#define int64 __int64
+#else
+#define int64 long long
+#endif
+
 /**
 @file cio.h
 @brief Implementation of a byte input-output process (CIO)
@@ -63,7 +70,7 @@ Write some bytes
 @param n Number of bytes to write
 @return Returns the number of bytes written or 0 if an error occured
 */
-unsigned int cio_write(opj_cio_t *cio, unsigned long long int v, int n);
+unsigned int cio_write(opj_cio_t *cio, unsigned int64 v, int n);
 /**
 Read some bytes
 @param cio CIO handle