Clean up pref.h.orig and deal with the consequences.

[pspp] / src / error.h

diff --git a/src/error.h b/src/error.h
index 6eb77a14b12bd1a7aa3905a421f51072ba080304..60bcbe85df5cef10bbda9f2c3f4fd615d4a0a85c 100644 (file)
--- a/src/error.h
+++ b/src/error.h
@@ -70,9 +70,9 @@ extern int err_verbosity;
 
 /* Functions. */
 void msg (int class, const char *format, ...)
-     __attribute__ ((format (printf, 2, 3)));
+     PRINTF_FORMAT (2, 3);
 void tmsg (int class, const char *title, const char *format, ...)
-     __attribute__ ((format (printf, 3, 4)));
+     PRINTF_FORMAT (3, 4);
 void err_failure (void);
 void err_cond_fail (void);
 
@@ -84,7 +84,7 @@ void err_location (struct file_locator *);
 /* Obscure functions. */
 void err_break (void);
 void err_check_count (void);
-void err_hcf (int exit_code) __attribute__ ((noreturn));
+void err_hcf (int exit_code) NO_RETURN;
 void err_vmsg (const struct error *);
 
 #endif /* error.h */