Mercurial > octave-nkf

changeset 4558:239df9c618ef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2003-10-28 18:48:07 by jwe]
author jwe
date Tue, 28 Oct 2003 18:48:07 +0000
parents dd92abda6569
children 802818bfac91
files libcruft/misc/f77-fcn.h
diffstat 1 files changed, 8 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/libcruft/misc/f77-fcn.h	Tue Oct 28 15:56:19 2003 +0000
+++ b/libcruft/misc/f77-fcn.h	Tue Oct 28 18:48:07 2003 +0000
@@ -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