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

Import from CVS: tag r21-0b34
author cvs
date Mon, 13 Aug 2007 10:28:48 +0200
parents 376386a54a3c
children 74fd4e045ea6
line wrap: on
line diff
--- a/src/tooltalk.h	Mon Aug 13 10:27:41 2007 +0200
+++ b/src/tooltalk.h	Mon Aug 13 10:28:48 2007 +0200
@@ -24,6 +24,7 @@
 
 #ifndef _XEMACS_TOOLTALK_H_
 #define _XEMACS_TOOLTALK_H_
+#include TT_C_H_PATH
 
 struct Lisp_Tooltalk_Message;
 DECLARE_LRECORD (tooltalk_message, struct Lisp_Tooltalk_Message);
@@ -44,8 +45,10 @@
 #define TOOLTALK_MESSAGE_KEY 100
 #define TOOLTALK_PATTERN_KEY 101
 
-#define CHECK_TOOLTALK_CONSTANT(x) \
-  { if ((!INTP (x)) && (!SYMBOLP (x))) x = wrong_type_argument (Qsymbolp, (x)); }
+#define CHECK_TOOLTALK_CONSTANT(x) do {		\
+  if (!(INTP (x) || SYMBOLP (x)))		\
+    dead_wrong_type_argument (Qsymbolp, (x));	\
+} while (0)
 
 #define VALID_TOOLTALK_MESSAGEP(m) \
    (m && (tt_ptr_error (m) == TT_OK))
@@ -53,8 +56,8 @@
 #define VALID_TOOLTALK_PATTERNP(p) \
    (p && (tt_ptr_error (p) == TT_OK))
 
-extern Lisp_Object box_tooltalk_message (Tt_message m);
-extern Tt_message unbox_tooltalk_message (Lisp_Object msg);
+Lisp_Object box_tooltalk_message (Tt_message m);
+Tt_message unbox_tooltalk_message (Lisp_Object msg);
 
 extern Lisp_Object Qtooltalk_error;