diff src/gpmevent.c @ 2834:172fb92bd156

[xemacs-hg @ 2005-06-28 11:32:13 by crestani] 2005-06-28 Marcus Crestani <crestani@xemacs.org> * gpmevent.c: Remove workaround. * gpmevent.c (Fgpm_enable): Use GET_DEFUN_LISP_OBJECT to get Lisp_Object of a built-in function. * gpmevent.c (syms_of_gpmevent): Remove workaround. * lisp.h (GET_DEFUN_LISP_OBJECT): New. Returns Lisp_Object of a DEFUN. * tooltalk.c (init_tooltalk): Use GET_DEFUN_LISP_OBJECT to get Lisp_Object of a built-in function.
author crestani
date Tue, 28 Jun 2005 11:32:15 +0000
parents 6fa9919a9a0b
children facf3239ba30
line wrap: on
line diff
--- a/src/gpmevent.c	Mon Jun 27 21:51:16 2005 +0000
+++ b/src/gpmevent.c	Tue Jun 28 11:32:15 2005 +0000
@@ -59,10 +59,6 @@
 static Lisp_Object gpm_event_queue;
 static Lisp_Object gpm_event_queue_tail;
 
-#ifdef MC_ALLOC
-static Lisp_Object MC_ALLOC_Freceive_gpm_event;
-#endif /* MC_ALLOC */
-
 struct __gpm_state
 {
   int gpm_tried;
@@ -597,11 +593,7 @@
 	{
 	  rval = 0;
 	  Fprocess_kill_without_query (gpm_process, Qnil);
-#ifdef MC_ALLOC
-	  gpm_filter = MC_ALLOC_Freceive_gpm_event;
-#else /* not MC_ALLOC */
-	  gpm_filter = wrap_subr (&SFreceive_gpm_event);
-#endif /* not MC_ALLOC */
+	  gpm_filter = GET_DEFUN_LISP_OBJECT (Freceive_gpm_event);
 	  set_process_filter (gpm_process, gpm_filter, 1, 0);
 
 	  /* Keep track of the device for later */
@@ -629,17 +621,7 @@
 
 void syms_of_gpmevent (void)
 {
-#ifdef MC_ALLOC
-#define DEFSUBR_receive_gpm_event(Fname)		\
-do {							\
-  DEFSUBR_MC_ALLOC (Fname);				\
-  defsubr (S##Fname);					\
-  MC_ALLOC_Freceive_gpm_event = wrap_subr (S##Fname);	\
-} while (0)
-  DEFSUBR_receive_gpm_event (Freceive_gpm_event);
-#else /* not MC_ALLOC */
   DEFSUBR (Freceive_gpm_event);
-#endif /* not MC_ALLOC */
   DEFSUBR (Fgpm_enable);
   DEFSUBR (Fgpm_enabled_p);
 }