Fix header exclusion defines that do not match the general pattern.

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>
 

src/cipher/cipher.h

@@ -1,8 +1,8 @@
 /***********************************************************************************************************************************
 Cipher Header
 ***********************************************************************************************************************************/
-#ifndef CIPHER_H
+#ifndef CIPHER_CIPHER_H
-#define CIPHER_H
+#define CIPHER_CIPHER_H
 
 #include "common/type.h"
 

src/cipher/random.h

@@ -1,8 +1,8 @@
 /***********************************************************************************************************************************
 Random Header
 ***********************************************************************************************************************************/
-#ifndef RANDOM_H
+#ifndef CIPHER_RANDOM_H
-#define RANDOM_H
+#define CIPHER_RANDOM_H
 
 // Functions
 void randomBytes(unsigned char *buffer, size_t size);

src/command/archive/push/push.h

@@ -1,8 +1,8 @@
 /***********************************************************************************************************************************
 Archive Push Command
 ***********************************************************************************************************************************/
-#ifndef COMMAND_ARCHIVE_PUSH_H
+#ifndef COMMAND_ARCHIVE_PUSH_PUSH_H
-#define COMMAND_ARCHIVE_PUSH_H
+#define COMMAND_ARCHIVE_PUSH_PUSH_H
 
 /***********************************************************************************************************************************
 Functions

src/command/command.h

@@ -1,8 +1,8 @@
 /***********************************************************************************************************************************
 Common Command Routines
 ***********************************************************************************************************************************/
-#ifndef COMMAND_H
+#ifndef COMMAND_COMMAND_H
-#define COMMAND_H
+#define COMMAND_COMMAND_H
 
 /***********************************************************************************************************************************
 Functions

src/command/help/help.h

@@ -1,8 +1,8 @@
 /***********************************************************************************************************************************
 Help Command
 ***********************************************************************************************************************************/
-#ifndef COMMAND_HELP_H
+#ifndef COMMAND_HELP_HELP_H
-#define COMMAND_HELP_H
+#define COMMAND_HELP_HELP_H
 
 /***********************************************************************************************************************************
 Functions

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
+#ifndef COMMON_ENCODE_H
-#define ENCODE_H
+#define COMMON_ENCODE_H
 
 #include "common/type.h"
 

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
+#ifndef COMMON_ENCODE_BASE64_H
-#define BASE64_H
+#define COMMON_ENCODE_BASE64_H
 
 #include "common/type.h"
 

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
+#ifndef COMMON_ERROR_H
-#define ERROR_H
+#define COMMON_ERROR_H
 
 #include <errno.h>
 #include <setjmp.h>

src/common/memContext.h

@@ -1,8 +1,8 @@
 /***********************************************************************************************************************************
 Memory Context Manager
 ***********************************************************************************************************************************/
-#ifndef MEM_CONTEXT_H
+#ifndef COMMON_MEMCONTEXT_H
-#define MEM_CONTEXT_H
+#define COMMON_MEMCONTEXT_H
 
 #include "common/error.h"
 #include "common/type.h"

src/common/type/stringList.h

@@ -1,8 +1,8 @@
 /***********************************************************************************************************************************
 String List Handler
 ***********************************************************************************************************************************/
-#ifndef COMMON_TYPE_STRING_LIST_H
+#ifndef COMMON_TYPE_STRINGLIST_H
-#define COMMON_TYPE_STRING_LIST_H
+#define COMMON_TYPE_STRINGLIST_H
 
 #include "common/type/string.h"
 

src/common/type/variantList.h

@@ -1,8 +1,8 @@
 /***********************************************************************************************************************************
 Variant List Handler
 ***********************************************************************************************************************************/
-#ifndef COMMON_TYPE_VARIANT_LIST_H
+#ifndef COMMON_TYPE_VARIANTLIST_H
-#define COMMON_TYPE_VARIANT_LIST_H
+#define COMMON_TYPE_VARIANTLIST_H
 
 /***********************************************************************************************************************************
 Variant list type

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
+#ifndef CONFIG_CONFIG_H
-#define CONFIG_H
+#define CONFIG_CONFIG_H
 
 #include "common/log.h"
 #include "common/type.h"

src/postgres/pageChecksum.h

@@ -1,8 +1,8 @@
 /***********************************************************************************************************************************
 Checksum Implementation for Data Pages
 ***********************************************************************************************************************************/
-#ifndef PAGE_CHECKSUM_H
+#ifndef POSTGRES_PAGECHECKSUM_H
-#define PAGE_CHECKSUM_H
+#define POSTGRES_PAGECHECKSUM_H
 
 #include "common/type.h"