--- a/src/defun-int.h	Wed Nov 29 22:58:53 2000 +0000
+++ b/src/defun-int.h	Thu Nov 30 00:19:11 2000 +0000
@@ -62,9 +62,12 @@
 extern void
 alias_builtin (const std::string& alias, const std::string& name);
 
-#define DECLARE_FUN(name, args_name, nargout_name) \
+#define DECLARE_FUNX(name, args_name, nargout_name) \
   octave_value_list \
-  F ## name (const octave_value_list& args_name, int nargout_name)
+  name (const octave_value_list& args_name, int nargout_name)
+
+#define DECLARE_FUN(name, args_name, nargout_name) \
+  DECLARE_FUNX (F ## name, args_name, nargout_name)
 
 // Define the code that will be used to insert the new function into
 // the symbol table.  We look for this name instead of the actual
@@ -96,6 +99,12 @@
     XDEFUN_INTERNAL (name, args_name, nargout_name, is_text_fcn, doc) \
   END_INSTALL_BUILTIN
 
+#define DEFUNX_INTERNAL(name, fname, args_name, nargout_name, \
+			is_text_fcn, doc) \
+  BEGIN_INSTALL_BUILTIN \
+    XDEFUN_INTERNAL (name, args_name, nargout_name, is_text_fcn, doc) \
+  END_INSTALL_BUILTIN
+
 // Generate code to install name in the symbol table.  The script
 // mkdefs will create a .def file for every .cc file that uses
 // DEFUN_DLD.
@@ -144,6 +153,10 @@
 #define DEFUN_INTERNAL(name, args_name, nargout_name, is_text_fcn, doc) \
   DECLARE_FUN (name, args_name, nargout_name)
 
+#define DEFUNX_INTERNAL(name, fname, args_name, nargout_name, \
+			is_text_fcn, doc) \
+  DECLARE_FUNX (fname, args_name, nargout_name)
+
 // No definition is required for an alias.
 
 #define DEFALIAS_INTERNAL(name, alias)