From: Tom Lane Date: Mon, 14 Jul 2003 23:36:15 +0000 (+0000) Subject: Remove duplicate definition of ERROR. X-Git-Tag: REL7_4_BETA1~217 X-Git-Url: http://git.postgresql.org/gitweb/?a=commitdiff_plain;h=683f4d0a25d46ad1422b0bb2f40183bd085a4333;p=postgresql.git Remove duplicate definition of ERROR. --- diff --git a/src/include/utils/elog.h b/src/include/utils/elog.h index f58a0325278..7cd815f6282 100644 --- a/src/include/utils/elog.h +++ b/src/include/utils/elog.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: elog.h,v 1.46 2003/07/04 02:51:34 tgl Exp $ + * $Id: elog.h,v 1.47 2003/07/14 23:36:15 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -35,9 +35,7 @@ #define WARNING 19 /* Warnings */ #define ERROR 20 /* user error - abort transaction; return * to known state */ -#define ERROR 20 /* user error - abort transaction; return - * to known state */ -/* Save ERROR value in PGERROR so it can bve restored when Win32 includes +/* Save ERROR value in PGERROR so it can be restored when Win32 includes * modify it. We have to use a constant rather than ERROR because macros * are expanded only when referenced outside macros. */