Mercurial > hg > xemacs-beta

diff src/tooltalk.c @ 272:c5d627a313b1 r21-0b34

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-0b34
author cvs
date Mon, 13 Aug 2007 10:28:48 +0200
parents 0e522484dd2a
children 6330739388db
line wrap: on
line diff
--- a/src/tooltalk.c	Mon Aug 13 10:27:41 2007 +0200
+++ b/src/tooltalk.c	Mon Aug 13 10:28:48 2007 +0200
@@ -28,7 +28,6 @@
 #include "lisp.h"
 
 #include <X11/Xlib.h>
-#include TT_C_H_PATH
 
 #include "buffer.h"
 #include "elhash.h"
@@ -151,13 +150,6 @@
   Tt_message m;
 };
 
-static Lisp_Object mark_tooltalk_message (Lisp_Object, void (*) (Lisp_Object));
-static void print_tooltalk_message (Lisp_Object, Lisp_Object, int);
-DEFINE_LRECORD_IMPLEMENTATION ("tooltalk-message", tooltalk_message,
-                               mark_tooltalk_message, print_tooltalk_message,
-                               0, 0, 0,
-			       struct Lisp_Tooltalk_Message);
-
 static Lisp_Object
 mark_tooltalk_message (Lisp_Object obj, void (*markobj) (Lisp_Object))
 {
@@ -181,13 +173,18 @@
   write_c_string (buf, printcharfun);
 }
 
+DEFINE_LRECORD_IMPLEMENTATION ("tooltalk-message", tooltalk_message,
+                               mark_tooltalk_message, print_tooltalk_message,
+                               0, 0, 0,
+			       struct Lisp_Tooltalk_Message);
+
 static Lisp_Object
 make_tooltalk_message (Tt_message m)
 {
+  Lisp_Object val;
   struct Lisp_Tooltalk_Message *msg =
     alloc_lcrecord_type (struct Lisp_Tooltalk_Message,
 			 lrecord_tooltalk_message);
-  Lisp_Object val;
 
   msg->m = m;
   msg->callback = Qnil;
@@ -227,13 +224,6 @@
   Tt_pattern p;
 };
 
-static Lisp_Object mark_tooltalk_pattern (Lisp_Object, void (*) (Lisp_Object));
-static void print_tooltalk_pattern (Lisp_Object, Lisp_Object, int);
-DEFINE_LRECORD_IMPLEMENTATION ("tooltalk-pattern", tooltalk_pattern,
-                               mark_tooltalk_pattern, print_tooltalk_pattern,
-                               0, 0, 0,
-			       struct Lisp_Tooltalk_Pattern);
-
 static Lisp_Object
 mark_tooltalk_pattern (Lisp_Object obj, void (*markobj) (Lisp_Object))
 {
@@ -257,6 +247,11 @@
   write_c_string (buf, printcharfun);
 }
 
+DEFINE_LRECORD_IMPLEMENTATION ("tooltalk-pattern", tooltalk_pattern,
+                               mark_tooltalk_pattern, print_tooltalk_pattern,
+                               0, 0, 0,
+			       struct Lisp_Tooltalk_Pattern);
+
 static Lisp_Object
 make_tooltalk_pattern (Tt_pattern p)
 {