# HG changeset patch
# User jwe
# Date 1067366887 0
# Node ID 239df9c618ef94f7aeb654e1c5f2b8b0c8ccab7c
# Parent  dd92abda6569b6a4f73c9b83c5b1036c5d962214
[project @ 2003-10-28 18:48:07 by jwe]

diff --git a/libcruft/misc/f77-fcn.h b/libcruft/misc/f77-fcn.h
--- a/libcruft/misc/f77-fcn.h
+++ b/libcruft/misc/f77-fcn.h
@@ -101,25 +101,24 @@
 // XXX FIXME XXX -- these should work for SV1 or Y-MP systems but will
 // need to be changed for others.
 
-union octave_cray_descriptor
+typedef union
 {
-  union
-  {
-    const char *const_ptr;
-    const char *ptr;
-  };
+  const char *const_ptr;
+  char *ptr;
   struct
   {
     unsigned off : 6;
     unsigned len : 26;
     unsigned add : 32;
   } mask;
-};
+} octave_cray_descriptor;
 
 typedef void *octave_cray_ftn_ch_dsc;
 
 #ifdef __cplusplus
 #define OCTAVE_F77_FCN_INLINE inline
+#else
+#define OCTAVE_F77_FCN_INLINE
 #endif
 
 static OCTAVE_F77_FCN_INLINE octave_cray_ftn_ch_dsc
@@ -128,7 +127,7 @@
   octave_cray_descriptor desc;
   desc.ptr = ptr_arg;
   desc.mask.len = len_arg << 3;
-  return *((octave_cray_fortran_character_descriptor *) &f);
+  return *((octave_cray_ftn_ch_dsc *) &desc);
 }
 
 static OCTAVE_F77_FCN_INLINE octave_cray_ftn_ch_dsc
@@ -137,7 +136,7 @@
   octave_cray_descriptor desc;
   desc.const_ptr = ptr_arg;
   desc.mask.len = len_arg << 3;
-  return *((octave_cray_fcd *) &f);
+  return *((octave_cray_ftn_ch_dsc *) &desc);
 }
 
 #ifdef __cplusplus