Fix sloppy macro coding (not enough parentheses).

diff --git a/src/include/access/xact.h b/src/include/access/xact.h
index 960538f4b5faa7e5f8f51c39550afa38632f5da2..c512a4a66f959a1b4afdbd9185fa410b0d15a29c 100644 (file)
--- a/src/include/access/xact.h
+++ b/src/include/access/xact.h
@@ -1,13 +1,13 @@
 /*-------------------------------------------------------------------------
  *
  * xact.h
- *       postgres transaction system header
+ *       postgres transaction system definitions
  *
  *
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: xact.h,v 1.26 2000/06/08 22:37:38 momjian Exp $
+ * $Id: xact.h,v 1.27 2000/07/28 01:04:40 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,6 +17,17 @@
 #include "access/transam.h"
 #include "utils/nabstime.h"
 
+/*
+ * Xact isolation levels
+ */
+#define XACT_DIRTY_READ                        0               /* not implemented */
+#define XACT_READ_COMMITTED            1
+#define XACT_REPEATABLE_READ   2               /* not implemented */
+#define XACT_SERIALIZABLE              3
+
+extern int     DefaultXactIsoLevel;
+extern int     XactIsoLevel;
+
 /* ----------------
  *             transaction state structure
  * ----------------
@@ -31,16 +42,7 @@ typedef struct TransactionStateData
        int                     blockState;
 } TransactionStateData;
 
-/*
- * Xact isolation levels
- */
-#define XACT_DIRTY_READ                        0               /* not implemented */
-#define XACT_READ_COMMITTED            1
-#define XACT_REPEATABLE_READ   2               /* not implemented */
-#define XACT_SERIALIZABLE              3
-
-extern int     DefaultXactIsoLevel;
-extern int     XactIsoLevel;
+typedef TransactionStateData *TransactionState;
 
 /* ----------------
  *             transaction states
@@ -64,23 +66,16 @@ extern int  XactIsoLevel;
 #define TBLOCK_ABORT                   4
 #define TBLOCK_ENDABORT                        5
 
-typedef TransactionStateData *TransactionState;
-
-#define TransactionIdIsValid(xid)              ((bool) (xid != NullTransactionId))
+/* ----------------
+ *             transaction ID manipulation macros
+ * ----------------
+ */
+#define TransactionIdIsValid(xid)              ((bool) ((xid) != NullTransactionId))
+#define TransactionIdEquals(id1, id2)  ((bool) ((id1) == (id2)))
 #define TransactionIdStore(xid, dest)  \
-       (*((TransactionId*)dest) = (TransactionId)xid)
+       (*((TransactionId*) (dest)) = (TransactionId) (xid))
 #define StoreInvalidTransactionId(dest) \
-       (*((TransactionId*)dest) = NullTransactionId)
-
-
-/* ----------------------------------------------------------------
- *             TransactionIdEquals
- * ----------------------------------------------------------------
- */
-#define TransactionIdEquals(id1, id2) \
-( \
-       ((bool) ((id1) == (id2))) \
-)
+       (*((TransactionId*) (dest)) = NullTransactionId)
 
 
 /* ----------------