5 files changed, 14 insertions, 14 deletions
diff --git a/src/include/access/genam.h b/src/include/access/genam.h
index e018bb8007e..934defb8a7b 100644
--- a/src/include/access/genam.h
+++ b/src/include/access/genam.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: genam.h,v 1.39 2003/02/24 00:57:17 tgl Exp $
+ * $Id: genam.h,v 1.40 2003/07/27 17:10:06 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -45,7 +45,7 @@ typedef bool (*IndexBulkDeleteCallback) (ItemPointer itemptr, void *state);
 typedef struct IndexVacuumCleanupInfo
 {
 	bool		vacuum_full;	/* VACUUM FULL (we have exclusive lock) */
-	int			message_level;	/* elog level for progress messages */
+	int			message_level;	/* ereport level for progress messages */
 } IndexVacuumCleanupInfo;
 
 /* Struct for heap-or-index scans of system tables */
diff --git a/src/include/access/tupmacs.h b/src/include/access/tupmacs.h
index b2bab69b810..85f9b0052e0 100644
--- a/src/include/access/tupmacs.h
+++ b/src/include/access/tupmacs.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: tupmacs.h,v 1.22 2002/08/24 15:00:46 tgl Exp $
+ * $Id: tupmacs.h,v 1.23 2003/07/27 17:10:07 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -155,7 +155,7 @@
 				*(Datum *) (T) = (newdatum); \
 				break; \
 			default: \
-				elog(ERROR, "store_att_byval: unsupported byval length %d", \
+				elog(ERROR, "unsupported byval length: %d", \
 					 (int) (attlen)); \
 				break; \
 		} \
@@ -177,7 +177,7 @@
 				*(int32 *) (T) = DatumGetInt32(newdatum); \
 				break; \
 			default: \
-				elog(ERROR, "store_att_byval: unsupported byval length %d", \
+				elog(ERROR, "unsupported byval length: %d", \
 					 (int) (attlen)); \
 				break; \
 		} \
diff --git a/src/include/libpq/pqcomm.h b/src/include/libpq/pqcomm.h
index caa186b8320..2e41b0896ad 100644
--- a/src/include/libpq/pqcomm.h
+++ b/src/include/libpq/pqcomm.h
@@ -9,7 +9,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pqcomm.h,v 1.90 2003/07/23 23:30:41 tgl Exp $
+ * $Id: pqcomm.h,v 1.91 2003/07/27 17:10:07 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,7 +21,7 @@
 /* workaround for clashing defines of "ERROR" */
 #ifdef ELOG_H
 #undef ERROR
-#define ERROR	(-1)
+#define ERROR	PGERROR
 #endif
 #else							/* not WIN32 */
 #include <sys/socket.h>
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index cfe065ffcf0..d6ded84abd7 100644
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -12,7 +12,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: miscadmin.h,v 1.126 2003/07/17 00:55:37 tgl Exp $
+ * $Id: miscadmin.h,v 1.127 2003/07/27 17:10:07 tgl Exp $
  *
  * NOTES
  *	  some of the information in this file should be moved to
@@ -53,10 +53,10 @@
  *
  * A related, but conceptually distinct, mechanism is the "critical section"
  * mechanism.  A critical section not only holds off cancel/die interrupts,
- * but causes any elog(ERROR) or elog(FATAL) to become elog(PANIC) --- that is,
- * a system-wide reset is forced.  Needless to say, only really *critical*
- * code should be marked as a critical section!  Currently, this mechanism
- * is only used for XLOG-related code.
+ * but causes any ereport(ERROR) or ereport(FATAL) to become ereport(PANIC)
+ * --- that is, a system-wide reset is forced.  Needless to say, only really
+ * *critical* code should be marked as a critical section!  Currently, this
+ * mechanism is only used for XLOG-related code.
  *
  *****************************************************************************/
 
diff --git a/src/include/storage/buf_internals.h b/src/include/storage/buf_internals.h
index 7a0407ffbfe..47a1e06fa24 100644
--- a/src/include/storage/buf_internals.h
+++ b/src/include/storage/buf_internals.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: buf_internals.h,v 1.59 2002/09/04 20:31:45 momjian Exp $
+ * $Id: buf_internals.h,v 1.60 2003/07/27 17:10:07 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -111,7 +111,7 @@ typedef struct sbufdesc
  * Each backend has its own BufferLocks[] array holding flag bits
  * showing what locks it has set on each buffer.
  *
- * We have to free these locks in elog(ERROR)...
+ * We have to free these locks during ereport(ERROR)...
  */
 #define BL_IO_IN_PROGRESS	(1 << 0)	/* unimplemented */
 #define BL_PIN_COUNT_LOCK	(1 << 1)