X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fmessage.h;h=604f185d530b42d37b9f0f68440a375839918d86;hb=92f198d13c9214c0d75b936f0ea0dc2684ea914b;hp=d46ea97d60505a8bed5e73cc6887570ed8add29a;hpb=a55b554c0479168ef3e4879fe0fa517f7ca4def7;p=pspp-builds.git

diff --git a/src/libpspp/message.h b/src/libpspp/message.h
index d46ea97d..604f185d 100644
--- a/src/libpspp/message.h
+++ b/src/libpspp/message.h
@@ -86,7 +86,9 @@ struct msg
   };
 
 /* Initialization. */
-void msg_init (void (*handler) (const struct msg *));
+void msg_init ( void (*handler) (const struct msg *), 
+		void (*location) (struct msg_locator *) ) ;
+
 void msg_done (void);
 
 struct msg * msg_dup(const struct msg *m);
@@ -102,18 +104,9 @@ 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 */