*** ls-mat5.cc	2012-04-08 08:28:18.708168006 -0700
--- src/ls-mat5.cc	2012-04-08 08:21:26.678168006 -0700
*************** along with Octave; see the file COPYING.
*** 82,88 ****
  #endif
  
  #define PAD(l) (((l) > 0 && (l) <= 4) ? 4 : (((l)+7)/8)*8)
- #define INT8(l) ((l) == miINT8 || (l) == miUINT8 || (l) == miUTF8)
  
  
  // The subsystem data block
--- 82,87 ----
*************** read_mat5_binary_element (std::istream&
*** 673,679 ****
        dims(1) = 1;
      }
  
!   if (read_mat5_tag (is, swap, type, len) || !INT8(type))
      {
        error ("load: invalid array name subelement");
        goto early_read_error;
--- 672,678 ----
        dims(1) = 1;
      }
  
!   if (read_mat5_tag (is, swap, type, len) || type != miINT8)
      {
        error ("load: invalid array name subelement");
        goto early_read_error;
*************** read_mat5_binary_element (std::istream&
*** 1058,1064 ****
            {
              int32_t fn_type;
              int32_t fn_len;
!             if (read_mat5_tag (is, swap, fn_type, fn_len) || !INT8(fn_type))
                {
                  error ("load: invalid field name subelement");
                  goto data_read_error;
--- 1057,1063 ----
            {
              int32_t fn_type;
              int32_t fn_len;
!             if (read_mat5_tag (is, swap, fn_type, fn_len) || fn_type != miINT8)
                {
                  error ("load: invalid field name subelement");
                  goto data_read_error;
*************** read_mat5_binary_element (std::istream&
*** 1119,1125 ****
        {
          isclass = true;
  
!         if (read_mat5_tag (is, swap, type, len) || !INT8(type))
            {
              error ("load: invalid class name");
              goto skip_ahead;
--- 1118,1124 ----
        {
          isclass = true;
  
!         if (read_mat5_tag (is, swap, type, len) || type != miINT8)
            {
              error ("load: invalid class name");
              goto skip_ahead;
*************** read_mat5_binary_element (std::istream&
*** 1169,1175 ****
  
          // field name subelement.  The length of this subelement tells
          // us how many fields there are.
!         if (read_mat5_tag (is, swap, fn_type, fn_len) || !INT8(fn_type))
            {
              error ("load: invalid field name subelement");
              goto data_read_error;
--- 1168,1174 ----
  
          // field name subelement.  The length of this subelement tells
          // us how many fields there are.
!         if (read_mat5_tag (is, swap, fn_type, fn_len) || fn_type != miINT8)
            {
              error ("load: invalid field name subelement");
              goto data_read_error;