diff src/eval.c @ 1111:184461bc8de4

[xemacs-hg @ 2002-11-18 06:52:23 by ben] warning fixes, etc. * s/cygwin32.h: -fvtable-thunks is obsolete in GCC 3 and generates warnings. * s/mingw32.h: * s/windowsnt.h: Comment fixes. * emodules.h: Fix warnings from redefining symbols. * eval.c: Fix C++ errors -- no automatic casting between function pointers and void *, function declarations inside of functions not allowed. * event-Xt.c (emacs_Xt_enqueue_focus_event): Warning fixes. * fileio.c (Ffile_truename): Warning fixes. Use LOCAL_TO_WIN32_FILE_FORMAT rather than duplicating it. * glyphs-x.c: Fix style. * intl-auto-encap-win32.c: * intl-auto-encap-win32.h: * intl-encap-win32.c: * intl-encap-win32.c (qxeRegConnectRegistry): * syswindows.h (RegConnectRegistry): DdeCreateStringHandle needs to be manual due to new Cygwin bug. * intl-win32.c: wcslen/wcscmp don't seem to exist under G++ 3, Cygwin. * lisp.h: * lisp-union.h: * lisp-disunion.h: * process-unix.c (unix_send_process): Ugh, C needs volatile and C++ must not have volatile. Remove previous volatile hacks, which don't seem to be working any more. * sheap.c (STATIC_HEAP_SLOP): Try to get a working Cygwin build with old unexec. * sheap.c (more_static_core): No NL's in literals allowed. * symbols.c (Fset): Fix C++ errors. * syswindows.h: Fix Cygwin complaints now that some missing structs have been added. aclocal.m4: Disable shared library modules under Cygwin for the moment, since we need some more tricky coding done and I don't have the time right now. configure.in, configure.usage: code-files.el, loadhist.el: Fix warnings. package-get.el: Fix warnings. NOTE: This was already fixed awhile ago, but reverted by Steve Y. Please be careful. postgresql/Makefile.in.in: Removed. Move common stuff into modues/common/Makefile.common. (Also add extraclean target and a couple of other fixes in that file.) postgresql/configure.ac: Extract out common configure stuff into modules/common/configure-{pre,post}.ac. postgresql/postgresql.c: Fix warning. ldap/Makefile.in.in: Removed. Move common stuff into modues/common/Makefile.common. (Also add extraclean target and a couple of other fixes in that file.) ldap/configure.ac: Extract out common configure stuff into modules/common/configure-{pre,post}.ac. common/Makefile.common: Common stuff is here.
author ben
date Mon, 18 Nov 2002 06:53:08 +0000
parents 0dc7756a58c4
children 37bdd24225ef
line wrap: on
line diff
--- a/src/eval.c	Sun Nov 17 22:53:08 2002 +0000
+++ b/src/eval.c	Mon Nov 18 06:53:08 2002 +0000
@@ -2063,11 +2063,11 @@
 			     Lisp_Object arg)
 {
   /* This function can GC */
-  int speccount = specpdl_depth();
+  int speccount = specpdl_depth ();
   Lisp_Object tem;
 
   /* ((handler-fun . (handler-arg . nil)) ... ) */
-  tem = noseeum_cons (noseeum_cons (make_opaque_ptr (handler),
+  tem = noseeum_cons (noseeum_cons (make_opaque_ptr ((void *) handler),
 				    noseeum_cons (handler_arg, Qnil)),
 		      Vcondition_handlers);
   record_unwind_protect (condition_bind_unwind, tem);
@@ -3673,6 +3673,22 @@
 }
 
 
+
+static void
+run_post_gc_hook (void)
+{
+  Lisp_Object args[2];
+
+  args[0] = Qpost_gc_hook;
+  args[1] = Fcons (Fcons (Qfinalize_list, zap_finalize_list ()), Qnil);
+  
+  run_hook_with_args_trapping_problems
+    ("Error in post-gc-hook",
+     2, args,
+     RUN_HOOKS_TO_COMPLETION,
+     INHIBIT_QUIT | NO_INHIBIT_ERRORS);
+}
+
 DEFUN ("funcall", Ffuncall, 1, MANY, 0, /*
 Call first argument as a function, passing the remaining arguments to it.
 Thus, (funcall 'cons 'x 'y) returns (x . y).
@@ -3703,11 +3719,9 @@
 	}
       if (need_to_signal_post_gc)
 	{
-	  static void run_post_gc_hook(void); /* forward */
-
 	  need_to_signal_post_gc = 0;
-	  recompute_funcall_allocation_flag();
-	  run_post_gc_hook();
+	  recompute_funcall_allocation_flag ();
+	  run_post_gc_hook ();
 	}
     }
 
@@ -5537,20 +5551,6 @@
 		   RUN_HOOKS_TO_COMPLETION, flags));
 }
 
-static void
-run_post_gc_hook()
-{
-  Lisp_Object args[2];
-
-  args[0] = Qpost_gc_hook;
-  args[1] = Fcons (Fcons (Qfinalize_list, zap_finalize_list()), Qnil);
-  
-  run_hook_with_args_trapping_problems
-    ("Error in post-gc-hook",
-     2, args,
-     RUN_HOOKS_TO_COMPLETION,
-     INHIBIT_QUIT | NO_INHIBIT_ERRORS);
-}
 
 /************************************************************************/
 /*		       The special binding stack			*/