From 46b6be6d7269ae35ff633736c4c5ddcde313d0d2 Mon Sep 17 00:00:00 2001
From: David Steele <david@pgmasters.net>
Date: Tue, 3 Apr 2018 13:35:56 -0400
Subject: [PATCH] Fix header exclusion defines that do not match the general
 pattern.

---
 doc/xml/release.xml             | 4 ++++
 src/cipher/cipher.h             | 4 ++--
 src/cipher/random.h             | 4 ++--
 src/command/archive/push/push.h | 4 ++--
 src/command/command.h           | 4 ++--
 src/command/help/help.h         | 4 ++--
 src/common/encode.h             | 4 ++--
 src/common/encode/base64.h      | 4 ++--
 src/common/error.h              | 4 ++--
 src/common/memContext.h         | 4 ++--
 src/common/type/stringList.h    | 4 ++--
 src/common/type/variantList.h   | 4 ++--
 src/config/config.h             | 4 ++--
 src/postgres/pageChecksum.h     | 4 ++--
 14 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/doc/xml/release.xml b/doc/xml/release.xml
index 7e21eb07f..801d5e7c3 100644
--- a/doc/xml/release.xml
+++ b/doc/xml/release.xml
@@ -38,6 +38,10 @@
                     <release-item>
                         <p>Add <code>ASSERT()</code> that is preserved in production builds.</p>
                     </release-item>
+
+                    <release-item>
+                        <p>Fix header exclusion defines that do not match the general pattern.</p>
+                    </release-item>
                 </release-development-list>
             </release-core-list>
 
diff --git a/src/cipher/cipher.h b/src/cipher/cipher.h
index f3d286b8f..b90a0ad84 100644
--- a/src/cipher/cipher.h
+++ b/src/cipher/cipher.h
@@ -1,8 +1,8 @@
 /***********************************************************************************************************************************
 Cipher Header
 ***********************************************************************************************************************************/
-#ifndef CIPHER_H
-#define CIPHER_H
+#ifndef CIPHER_CIPHER_H
+#define CIPHER_CIPHER_H
 
 #include "common/type.h"
 
diff --git a/src/cipher/random.h b/src/cipher/random.h
index 279838cc1..d423fc199 100644
--- a/src/cipher/random.h
+++ b/src/cipher/random.h
@@ -1,8 +1,8 @@
 /***********************************************************************************************************************************
 Random Header
 ***********************************************************************************************************************************/
-#ifndef RANDOM_H
-#define RANDOM_H
+#ifndef CIPHER_RANDOM_H
+#define CIPHER_RANDOM_H
 
 // Functions
 void randomBytes(unsigned char *buffer, size_t size);
diff --git a/src/command/archive/push/push.h b/src/command/archive/push/push.h
index c88ba722b..0055ee886 100644
--- a/src/command/archive/push/push.h
+++ b/src/command/archive/push/push.h
@@ -1,8 +1,8 @@
 /***********************************************************************************************************************************
 Archive Push Command
 ***********************************************************************************************************************************/
-#ifndef COMMAND_ARCHIVE_PUSH_H
-#define COMMAND_ARCHIVE_PUSH_H
+#ifndef COMMAND_ARCHIVE_PUSH_PUSH_H
+#define COMMAND_ARCHIVE_PUSH_PUSH_H
 
 /***********************************************************************************************************************************
 Functions
diff --git a/src/command/command.h b/src/command/command.h
index e8efe7dfb..3102aad74 100644
--- a/src/command/command.h
+++ b/src/command/command.h
@@ -1,8 +1,8 @@
 /***********************************************************************************************************************************
 Common Command Routines
 ***********************************************************************************************************************************/
-#ifndef COMMAND_H
-#define COMMAND_H
+#ifndef COMMAND_COMMAND_H
+#define COMMAND_COMMAND_H
 
 /***********************************************************************************************************************************
 Functions
diff --git a/src/command/help/help.h b/src/command/help/help.h
index c9cbf1447..454ed7531 100644
--- a/src/command/help/help.h
+++ b/src/command/help/help.h
@@ -1,8 +1,8 @@
 /***********************************************************************************************************************************
 Help Command
 ***********************************************************************************************************************************/
-#ifndef COMMAND_HELP_H
-#define COMMAND_HELP_H
+#ifndef COMMAND_HELP_HELP_H
+#define COMMAND_HELP_HELP_H
 
 /***********************************************************************************************************************************
 Functions
diff --git a/src/common/encode.h b/src/common/encode.h
index a0430ce95..a435740fb 100644
--- a/src/common/encode.h
+++ b/src/common/encode.h
@@ -3,8 +3,8 @@ Binary to String Encode/Decode
 
 These high-level functions are preferred to the low-level functions for each encoding type in the encode subdirectory.
 ***********************************************************************************************************************************/
-#ifndef ENCODE_H
-#define ENCODE_H
+#ifndef COMMON_ENCODE_H
+#define COMMON_ENCODE_H
 
 #include "common/type.h"
 
diff --git a/src/common/encode/base64.h b/src/common/encode/base64.h
index c6430c2b6..3aad7fe20 100644
--- a/src/common/encode/base64.h
+++ b/src/common/encode/base64.h
@@ -3,8 +3,8 @@ Base64 Binary to String Encode/Decode
 
 The high-level functions in encode.c should be used in preference to these low-level functions.
 ***********************************************************************************************************************************/
-#ifndef BASE64_H
-#define BASE64_H
+#ifndef COMMON_ENCODE_BASE64_H
+#define COMMON_ENCODE_BASE64_H
 
 #include "common/type.h"
 
diff --git a/src/common/error.h b/src/common/error.h
index 0d08fec59..e91d40bd9 100644
--- a/src/common/error.h
+++ b/src/common/error.h
@@ -34,8 +34,8 @@ gcc's -Wclobbered warnings are almost entirely useless for catching such issues.
 
 IMPORTANT: Never call return from within any of the error-handling blocks.
 ***********************************************************************************************************************************/
-#ifndef ERROR_H
-#define ERROR_H
+#ifndef COMMON_ERROR_H
+#define COMMON_ERROR_H
 
 #include <errno.h>
 #include <setjmp.h>
diff --git a/src/common/memContext.h b/src/common/memContext.h
index 2492431ed..ccd62260f 100644
--- a/src/common/memContext.h
+++ b/src/common/memContext.h
@@ -1,8 +1,8 @@
 /***********************************************************************************************************************************
 Memory Context Manager
 ***********************************************************************************************************************************/
-#ifndef MEM_CONTEXT_H
-#define MEM_CONTEXT_H
+#ifndef COMMON_MEMCONTEXT_H
+#define COMMON_MEMCONTEXT_H
 
 #include "common/error.h"
 #include "common/type.h"
diff --git a/src/common/type/stringList.h b/src/common/type/stringList.h
index 18be4ce09..2cff61e76 100644
--- a/src/common/type/stringList.h
+++ b/src/common/type/stringList.h
@@ -1,8 +1,8 @@
 /***********************************************************************************************************************************
 String List Handler
 ***********************************************************************************************************************************/
-#ifndef COMMON_TYPE_STRING_LIST_H
-#define COMMON_TYPE_STRING_LIST_H
+#ifndef COMMON_TYPE_STRINGLIST_H
+#define COMMON_TYPE_STRINGLIST_H
 
 #include "common/type/string.h"
 
diff --git a/src/common/type/variantList.h b/src/common/type/variantList.h
index 8cba40385..a6eda2190 100644
--- a/src/common/type/variantList.h
+++ b/src/common/type/variantList.h
@@ -1,8 +1,8 @@
 /***********************************************************************************************************************************
 Variant List Handler
 ***********************************************************************************************************************************/
-#ifndef COMMON_TYPE_VARIANT_LIST_H
-#define COMMON_TYPE_VARIANT_LIST_H
+#ifndef COMMON_TYPE_VARIANTLIST_H
+#define COMMON_TYPE_VARIANTLIST_H
 
 /***********************************************************************************************************************************
 Variant list type
diff --git a/src/config/config.h b/src/config/config.h
index a83a9061f..80880bff2 100644
--- a/src/config/config.h
+++ b/src/config/config.h
@@ -4,8 +4,8 @@ Command and Option Configuration
 This module serves as a database for the configuration options.  The configuration rules reside in config/define.c and
 config/parse.c sets the command and options and determines which options are valid for a command.
 ***********************************************************************************************************************************/
-#ifndef CONFIG_H
-#define CONFIG_H
+#ifndef CONFIG_CONFIG_H
+#define CONFIG_CONFIG_H
 
 #include "common/log.h"
 #include "common/type.h"
diff --git a/src/postgres/pageChecksum.h b/src/postgres/pageChecksum.h
index e67298fed..ff681731e 100644
--- a/src/postgres/pageChecksum.h
+++ b/src/postgres/pageChecksum.h
@@ -1,8 +1,8 @@
 /***********************************************************************************************************************************
 Checksum Implementation for Data Pages
 ***********************************************************************************************************************************/
-#ifndef PAGE_CHECKSUM_H
-#define PAGE_CHECKSUM_H
+#ifndef POSTGRES_PAGECHECKSUM_H
+#define POSTGRES_PAGECHECKSUM_H
 
 #include "common/type.h"