X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ferror.c;h=9896fb279cba29d08c2fe1d4d672894ba5eb9eb1;hb=5382abe75bbd1689aca8c922fbf084af9f6bd723;hp=803cdc71bcc4a22638d501e165dfdf29f770be7f;hpb=cb4033020c8a24d573814e6ac9192046bffdccac;p=pspp-builds.git diff --git a/src/error.c b/src/error.c index 803cdc71..9896fb27 100644 --- a/src/error.c +++ b/src/error.c @@ -17,32 +17,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* AIX requires this to be the first thing in the file. */ #include -#if __GNUC__ -#define alloca __builtin_alloca -#else -#if HAVE_ALLOCA_H -#include -#else -#ifdef _AIX -#pragma alloca -#else -#ifndef alloca /* predefined by HP cc +Olibcalls */ -char *alloca (); -#endif -#endif -#endif -#endif - #include +#include "error.h" #include #include #include #include #include "alloc.h" #include "command.h" -#include "error.h" #include "getline.h" #include "main.h" #include "output.h" @@ -276,11 +259,11 @@ err_vmsg (const struct error *e) {0, NULL, N_("installation error")}, /* IE */ {2, NULL, N_("installation error")}, /* IS */ - {2, NULL, N_("error")}, /* DE */ - {2, NULL, N_("warning")}, /* DW */ + {2, &err_error_count, N_("error")}, /* DE */ + {2, &err_warning_count, N_("warning")}, /* DW */ - {0, NULL, N_("error")}, /* ME */ - {0, NULL, N_("warning")}, /* MW */ + {0, &err_error_count, N_("error")}, /* ME */ + {0, &err_warning_count, N_("warning")}, /* MW */ {0, NULL, N_("note")}, /* MM */ };