Fix macros that were not properly surrounded by parens or braces.

2 files changed, 16 insertions, 8 deletions

diff --git a/src/backend/tioga/Arr_TgRecipe.h b/src/backend/tioga/Arr_TgRecipe.h
index 9cfec9585e..ddfcf8ce38 100644
--- a/src/backend/tioga/Arr_TgRecipe.h
+++ b/src/backend/tioga/Arr_TgRecipe.h
@@ -43,8 +43,10 @@ typedef struct Arr_TgString
   (Arr_TgString *) NewVarray(ARR_TgString_INITIAL_SIZE, sizeof(TgString))
 
 #define enlargeArr_TgString(A, I) \
-  (A)->size += (I); \
-  (A)->val = (TgString *) realloc((A)->val, (A)->valSize * (A)->size)
+( \
+  (A)->size += (I), \
+  (A)->val = (TgString *) realloc((A)->val, (A)->valSize * (A)->size) \
+)
 
 #define addArr_TgString(A, V) \
   AppendVarray((Varray *) (A), (void *) (V), (CopyingFunct) copyTgString)
@@ -79,8 +81,10 @@ typedef struct Arr_TgElementPtr
   (Arr_TgElementPtr *) NewVarray(ARR_TgElementPtr_INITIAL_SIZE, sizeof(TgElementPtr))
 
 #define enlargeArr_TgElementPtr(A, I) \
-  (A)->size += (I); \
-  (A)->val = (TgElementPtr *) realloc((A)->val, (A)->valSize * (A)->size)
+( \
+  (A)->size += (I), \
+  (A)->val = (TgElementPtr *) realloc((A)->val, (A)->valSize * (A)->size) \
+)
 
 #define addArr_TgElementPtr(A, V) \
   AppendVarray((Varray *) (A), (void *) (V), (CopyingFunct) copyTgElementPtr)
@@ -115,8 +119,10 @@ typedef struct Arr_TgNodePtr
   (Arr_TgNodePtr *) NewVarray(ARR_TgNodePtr_INITIAL_SIZE, sizeof(TgNodePtr))
 
 #define enlargeArr_TgNodePtr(A, I) \
-  (A)->size += (I); \
-  (A)->val = (TgNodePtr *) realloc((A)->val, (A)->valSize * (A)->size)
+( \
+  (A)->size += (I), \
+  (A)->val = (TgNodePtr *) realloc((A)->val, (A)->valSize * (A)->size) \
+)
 
 #define addArr_TgNodePtr(A, V) \
   AppendVarray((Varray *) (A), (void *) (V), (CopyingFunct) copyTgNodePtr)
diff --git a/src/backend/tioga/Varray.h b/src/backend/tioga/Varray.h
index 496b04520a..3b229ce462 100644
--- a/src/backend/tioga/Varray.h
+++ b/src/backend/tioga/Varray.h
@@ -23,9 +23,11 @@ typedef void (*CopyingFunct) (void *from, void *to);
 #define VARRAY_INITIAL_SIZE 32
 
 #define ENLARGE_VARRAY(ARRAY, INC) \
-  (ARRAY)->maxObj += (INC); \
+( \
+  (ARRAY)->maxObj += (INC), \
   (ARRAY)->val = (void *) realloc((ARRAY)->val, \
-								  (ARRAY)->size * (ARRAY)->maxObj)
+								  (ARRAY)->size * (ARRAY)->maxObj) \
+)
 
 #define VARRAY_NTH(VAL, SIZE, N) (((char *) (VAL)) + (SIZE) * (N))