# HG changeset patch
# User jwe
# Date 1156214261 0
# Node ID c7105ffca0b645af86607642a8556687993a7369
# Parent  8b4d38c76bfa6d68f27bbe719430aa1c378ec319
[project @ 2006-08-22 02:37:41 by jwe]

diff -r 8b4d38c76bfa -r c7105ffca0b6 src/ChangeLog
--- a/src/ChangeLog	Tue Aug 22 01:20:22 2006 +0000
+++ b/src/ChangeLog	Tue Aug 22 02:37:41 2006 +0000
@@ -1,5 +1,8 @@
 2006-08-21  John W. Eaton  <jwe@octave.org>
 
+	* ls-mat5.cc (read_mat5_binary_data, read_mat5_integer_data,
+	write_mat5_array): Unconditionally enable code for 64-bit int types.
+
 	* ov-fcn-handle.cc (DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA):	
 	For compatibility, set class to function_handle.
 
diff -r 8b4d38c76bfa -r c7105ffca0b6 src/ls-mat5.cc
--- a/src/ls-mat5.cc	Tue Aug 22 01:20:22 2006 +0000
+++ b/src/ls-mat5.cc	Tue Aug 22 02:37:41 2006 +0000
@@ -157,16 +157,13 @@
     case miRESERVE3:
       break;
 
+    // FIXME -- how are the 64-bit cases supposed to work here?
     case miINT64:
-#ifdef int64_t
       read_doubles (is, data, LS_LONG, count, swap, flt_fmt);
-#endif
       break;
 
     case miUINT64:
-#ifdef int64_t
       read_doubles (is, data, LS_U_LONG, count, swap, flt_fmt);
-#endif
       break;
 
     case miMATRIX:
@@ -230,15 +227,11 @@
       break;
 
     case miINT64:
-#ifdef int64_t
       READ_INTEGER_DATA (int64_t, swap, m, 8, count, is);
-#endif
       break;
 
     case miUINT64:
-#ifdef int64_t
       READ_INTEGER_DATA (uint64_t, swap, m, 8, count, is);
-#endif
       break;
 
     case miMATRIX:
@@ -1104,13 +1097,9 @@
 	MAT5_DO_WRITE (uint32_t, data, nel, os);
 	break;
 	
-	// provide for 64 bit ints, even though get_save_type does
-	// not yet implement them
-#ifdef int64_t
       case LS_U_LONG:
 	MAT5_DO_WRITE (uint64_t, data, nel, os);
 	break;
-#endif
 
       case LS_CHAR:
 	MAT5_DO_WRITE (int8_t, data, nel, os);
@@ -1124,11 +1113,9 @@
 	MAT5_DO_WRITE (int32_t, data, nel, os);
 	break;
 
-#ifdef int64_t
       case LS_LONG:
 	MAT5_DO_WRITE (int64_t, data, nel, os);
 	break;
-#endif
 
       case LS_FLOAT:
 	MAT5_DO_WRITE (float, data, nel, os);