[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Changes to m4/src/m4.h,v [branch-1_4]
From: |
Eric Blake |
Subject: |
Changes to m4/src/m4.h,v [branch-1_4] |
Date: |
Tue, 08 Aug 2006 16:24:00 +0000 |
CVSROOT: /sources/m4
Module name: m4
Branch: branch-1_4
Changes by: Eric Blake <ericb> 06/08/08 16:23:58
Index: src/m4.h
===================================================================
RCS file: /sources/m4/m4/src/m4.h,v
retrieving revision 1.1.1.1.2.25
retrieving revision 1.1.1.1.2.26
diff -u -b -r1.1.1.1.2.25 -r1.1.1.1.2.26
--- src/m4.h 4 Aug 2006 13:19:41 -0000 1.1.1.1.2.25
+++ src/m4.h 8 Aug 2006 16:23:58 -0000 1.1.1.1.2.26
@@ -56,6 +56,7 @@
#include "stdio--.h"
#include "stdlib--.h"
#include "unistd--.h"
+#include "verror.h"
#include "xalloc.h"
/* If FALSE is defined, we presume TRUE is defined too. In this case,
@@ -123,33 +124,10 @@
extern int retcode;
extern const char *program_name;
-/* It would be so much nicer if the gnulib error module provided a
- va_list version of error, so that we wouldn't need to use macros
- and a global hook variable. Oh well. */
-#if 0
void m4_error (int, int, const char *, ...) M4_GNUC_PRINTF(3, 4);
-/* Would be implemented as:
-void
-m4_error (int status, int errnum, const char *format, ...)
-{
- va_list args;
- va_start (args, format);
- verror_at_line (status, errnum, current_file, current_line, format, args);
-}
-*/
-#endif
-
-#define M4ERROR(Arglist) (error Arglist)
-#define M4ERROR_AT_LINE(Arglist) \
- do \
- { \
- suppress_line = TRUE; \
- (error_at_line Arglist); \
- } \
- while (0)
-extern boolean suppress_line;
-void reference_error (void);
+#define M4ERROR(Arglist) (m4_error Arglist)
+#define M4ERROR_AT_LINE(Arglist) (error_at_line Arglist)
#ifdef USE_STACKOVF
void setup_stackovf_trap (char *const *, char *const *,
- Changes to m4/src/m4.h,v [branch-1_4], Eric Blake, 2006/08/03
- Changes to m4/src/m4.h,v [branch-1_4], Eric Blake, 2006/08/04
- Changes to m4/src/m4.h,v [branch-1_4],
Eric Blake <=
- Changes to m4/src/m4.h,v [branch-1_4], Eric Blake, 2006/08/08
- Changes to m4/src/m4.h,v [branch-1_4], Eric Blake, 2006/08/18