X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fmessage.h;h=9e876e410b29b20a744a748e0744d5b8ab790b4d;hb=bc02bc027697df3207f827de722c26d8cc87e824;hp=9f037cb264d80683c54f8377c56a5e5254b9f1a2;hpb=618a58ebb4c59dff83374278e44b7375b3865935;p=pspp

diff --git a/src/libpspp/message.h b/src/libpspp/message.h
index 9f037cb264..9e876e410b 100644
--- a/src/libpspp/message.h
+++ b/src/libpspp/message.h
@@ -1,6 +1,5 @@
 /* PSPP - computes sample statistics.
    Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
-   Written by Ben Pfaff <blp@gnu.org>.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -85,9 +84,10 @@ struct msg
     char *text;                 /* Error text. */
   };
 
+struct source_stream ;
+
 /* Initialization. */
-void msg_init ( void (*handler) (const struct msg *), 
-		void (*location) (struct msg_locator *) ) ;
+void msg_init (struct source_stream *, void (*handler) (const struct msg *) );
 
 void msg_done (void);
 
@@ -99,6 +99,10 @@ 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);
@@ -107,15 +111,6 @@ void msg_pop_msg_locator (const 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__)) )
+void request_bug_report_and_abort (const char *msg) NO_RETURN;
 
 #endif /* message.h */