Correct ifdef flags of header files for GTM and XC-specific things

Some flags were simply not set, others had ambiguous settings.

7 files changed, 14 insertions, 13 deletions

diff --git a/src/include/gtm/elog.h b/src/include/gtm/elog.h
index bb4b999b3a..432d35708d 100644
--- a/src/include/gtm/elog.h
+++ b/src/include/gtm/elog.h
@@ -252,4 +252,4 @@ write_stderr(const char *fmt,...)
    the supplied arguments. */
 __attribute__((format(printf, 1, 2)));
 
-#endif   /* ELOG_H */
+#endif   /* GTM_ELOG_H */
diff --git a/src/include/gtm/gtm_ip.h b/src/include/gtm/gtm_ip.h
index a939841d9c..b88b0f106c 100644
--- a/src/include/gtm/gtm_ip.h
+++ b/src/include/gtm/gtm_ip.h
@@ -13,8 +13,8 @@
  *
  *-------------------------------------------------------------------------
  */
-#ifndef IP_H
-#define IP_H
+#ifndef GTM_IP_H
+#define GTM_IP_H
 
 #include "gtm/pqcomm.h"
 
@@ -47,4 +47,4 @@ extern void gtm_promote_v4_to_v6_mask(struct sockaddr_storage * addr);
 #define IS_AF_UNIX(fam) (0)
 #endif
 
-#endif   /* IP_H */
+#endif   /* GTM_IP_H */
diff --git a/src/include/gtm/gtm_opt_tables.h b/src/include/gtm/gtm_opt_tables.h
index 8bf82e6dcf..7139f46c73 100644
--- a/src/include/gtm/gtm_opt_tables.h
+++ b/src/include/gtm/gtm_opt_tables.h
@@ -11,7 +11,7 @@
  *-------------------------------------------------------------------------
  */
 #ifndef GTM_OPT_TABLES_H
-#define GTM_OPT_TABLES_H 1
+#define GTM_OPT_TABLES_H
 
 #include "gtm/gtm_opt.h"
 
diff --git a/src/include/gtm/gtm_utils.h b/src/include/gtm/gtm_utils.h
index 75c14a73f0..c40f4c912d 100644
--- a/src/include/gtm/gtm_utils.h
+++ b/src/include/gtm/gtm_utils.h
@@ -21,4 +21,4 @@ void gtm_util_init_nametabs(void);
 char *gtm_util_message_name(GTM_MessageType type);
 char *gtm_util_result_name(GTM_ResultType type);
 
-#endif /* GTM_UTIL_H */
+#endif /* GTM_UTILS_H */
diff --git a/src/include/gtm/register.h b/src/include/gtm/register.h
index 87307610dd..4d0e99f068 100644
--- a/src/include/gtm/register.h
+++ b/src/include/gtm/register.h
@@ -11,8 +11,8 @@
  *
  *-------------------------------------------------------------------------
  */
-#ifndef _REGISTER_H
-#define _REGISTER_H
+#ifndef GTM_REGISTER_H
+#define GTM_REGISTER_H
 
 #include "gtm/libpq-be.h"
 #include "gtm/gtm_c.h"
diff --git a/src/include/pgxc/pgxc.h b/src/include/pgxc/pgxc.h
index 898fe15df3..21cd9c6beb 100644
--- a/src/include/pgxc/pgxc.h
+++ b/src/include/pgxc/pgxc.h
@@ -11,7 +11,8 @@
  *
  *-------------------------------------------------------------------------
  */
-#ifdef PGXC
+#ifndef PGXC_H
+#define PGXC_H
 
 #include "storage/lwlock.h"
 
@@ -44,4 +45,4 @@ extern uint32	PGXCNodeIdentifier;
 #define IsConnFromDatanode() (remoteConnType == REMOTE_CONN_DATANODE)
 #define IsConnFromGtm() (remoteConnType == REMOTE_CONN_GTM)
 #define IsConnFromGtmProxy() (remoteConnType == REMOTE_CONN_GTM_PROXY)
-#endif   /* PGXC */
+#endif   /* PGXC_H */
diff --git a/src/include/pgxc/pgxcnode.h b/src/include/pgxc/pgxcnode.h
index 87046106cf..31f973cbca 100644
--- a/src/include/pgxc/pgxcnode.h
+++ b/src/include/pgxc/pgxcnode.h
@@ -13,8 +13,8 @@
  *-------------------------------------------------------------------------
  */
 
-#ifndef DATANODE_H
-#define DATANODE_H
+#ifndef PGXCNODE_H
+#define PGXCNODE_H
 #include "postgres.h"
 #include "gtm/gtm_c.h"
 #include "utils/timestamp.h"
@@ -194,4 +194,4 @@ extern void add_error_message(PGXCNodeHandle * handle, const char *message);
 
 extern Datum pgxc_execute_on_nodes(int numnodes, Oid *nodelist, char *query);
 
-#endif
+#endif /* PGXCNODE_H */