Applied patch #5611

[pspp-builds.git] / src / libpspp / message.h

diff --git a/src/libpspp/message.h b/src/libpspp/message.h
index d46ea97d60505a8bed5e73cc6887570ed8add29a..ba35b35104c9c67736dd52f21abe5130c1405ffa 100644 (file)
--- a/src/libpspp/message.h
+++ b/src/libpspp/message.h
@@ -85,8 +85,11 @@ struct msg
     char *text;                 /* Error text. */
   };
 
+struct source_stream ;
+
 /* Initialization. */
-void msg_init (void (*handler) (const struct msg *));
+void msg_init (struct source_stream *, void (*handler) (const struct msg *) );
+
 void msg_done (void);
 
 struct msg * msg_dup(const struct msg *m);
@@ -97,23 +100,18 @@ void msg (enum msg_class, const char *format, ...)
      PRINTF_FORMAT (2, 3);
 void msg_emit (struct msg *);
 
+/* Enable and disable messages. */
+void msg_enable (void);
+void msg_disable (void);
+
 /* Error context. */
 void msg_set_command_name (const char *);
 const char *msg_get_command_name (void);
 void msg_push_msg_locator (const struct msg_locator *);
 void msg_pop_msg_locator (const struct msg_locator *);
-void msg_location (struct msg_locator *);
 
-/* Used in panic situations only. */
-void request_bug_report_and_abort (const char *msg);
-
-void msg_assert_fail (const char *expr, const char *file, int line);
 
-#undef __STRING
-#define __STRING(x) #x
-#undef assert
-                              
-#define assert(expr) ( (void) ( expr ? (void) 0 : \
-              msg_assert_fail(__STRING(expr), __FILE__, __LINE__)) )
+/* Used in panic situations only. */
+void request_bug_report_and_abort (const char *msg) NO_RETURN;
 
 #endif /* message.h */