diff libcruft/misc/f77-fcn.h @ 5760:8d7162924bd3

[project @ 2006-04-14 04:01:37 by jwe]
author jwe
date Fri, 14 Apr 2006 04:01:40 +0000
parents 252b6754e545
children 26f92fb8ba33
line wrap: on
line diff
--- a/libcruft/misc/f77-fcn.h	Thu Apr 13 13:04:33 2006 +0000
+++ b/libcruft/misc/f77-fcn.h	Fri Apr 14 04:01:40 2006 +0000
@@ -55,11 +55,11 @@
       octave_jmp_buf saved_context; \
       f77_exception_encountered = 0; \
       sig_atomic_t saved_octave_interrupt_immediately = octave_interrupt_immediately; \
-      octave_save_current_context ((char *) saved_context); \
+      octave_save_current_context (saved_context); \
       if (octave_set_current_context) \
 	{ \
 	  octave_interrupt_immediately = saved_octave_interrupt_immediately; \
-          octave_restore_current_context ((char *) saved_context); \
+          octave_restore_current_context (saved_context); \
 	  if (f77_exception_encountered) \
 	    F77_XFCN_ERROR (f, F); \
           else if (octave_allocation_error) \
@@ -72,7 +72,7 @@
 	  octave_interrupt_immediately++; \
 	  F77_FUNC (f, F) args; \
 	  octave_interrupt_immediately--; \
-          octave_restore_current_context ((char *) saved_context); \
+          octave_restore_current_context (saved_context); \
         } \
     } \
   while (0)
@@ -169,7 +169,7 @@
 #define F77_CHAR_ARG2(x, l) x
 #define F77_CONST_CHAR_ARG2(x, l) F77_CHAR_ARG2 (x, l)
 #define F77_CXX_STRING_ARG(x) F77_CONST_CHAR_ARG2 (x.c_str (), x.length ())
-#define F77_CHAR_ARG_LEN(l) , (long) l
+#define F77_CHAR_ARG_LEN(l) , l
 #define F77_CHAR_ARG_DECL char *
 #define F77_CONST_CHAR_ARG_DECL const char *
 #define F77_CHAR_ARG_LEN_DECL , long