From 015e95040c63fead7b8c181bc0c8002708f5cc48 Mon Sep 17 00:00:00 2001
From: Eric Biggers <ebiggers3@gmail.com>
Date: Mon, 5 Sep 2016 13:50:32 -0700
Subject: [PATCH] Remove leading underscores from include guards

---
 lib/adler32.h            | 6 +++---
 lib/aligned_malloc.h     | 6 +++---
 lib/crc32.h              | 6 +++---
 lib/deflate_compress.h   | 6 +++---
 lib/deflate_constants.h  | 6 +++---
 lib/gzip_constants.h     | 6 +++---
 lib/lib_common.h         | 6 +++---
 lib/matchfinder_common.h | 6 +++---
 lib/x86_cpu_features.h   | 6 +++---
 lib/zlib_constants.h     | 6 +++---
 programs/detect.sh       | 6 +++---
 11 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/lib/adler32.h b/lib/adler32.h
index 11d78bd..73f0260 100644
--- a/lib/adler32.h
+++ b/lib/adler32.h
@@ -2,11 +2,11 @@
  * adler32.h - Adler-32 checksum algorithm
  */
 
-#ifndef _LIB_ADLER32_H
-#define _LIB_ADLER32_H
+#ifndef LIB_ADLER32_H
+#define LIB_ADLER32_H
 
 #include "lib_common.h"
 
 extern u32 adler32(const void *buffer, size_t size);
 
-#endif /* _LIB_ADLER32_H */
+#endif /* LIB_ADLER32_H */
diff --git a/lib/aligned_malloc.h b/lib/aligned_malloc.h
index 2b3f0f9..ee6e7b8 100644
--- a/lib/aligned_malloc.h
+++ b/lib/aligned_malloc.h
@@ -2,12 +2,12 @@
  * aligned_malloc.c - aligned memory allocation
  */
 
-#ifndef _LIB_ALIGNED_MALLOC_H
-#define _LIB_ALIGNED_MALLOC_H
+#ifndef LIB_ALIGNED_MALLOC_H
+#define LIB_ALIGNED_MALLOC_H
 
 #include "lib_common.h"
 
 extern void *aligned_malloc(size_t alignment, size_t size);
 extern void aligned_free(void *ptr);
 
-#endif /* _LIB_ALIGNED_MALLOC_H */
+#endif /* LIB_ALIGNED_MALLOC_H */
diff --git a/lib/crc32.h b/lib/crc32.h
index c859e34..2b9e957 100644
--- a/lib/crc32.h
+++ b/lib/crc32.h
@@ -2,11 +2,11 @@
  * crc32.h - CRC-32 checksum algorithm for the gzip format
  */
 
-#ifndef _LIB_CRC32_H
-#define _LIB_CRC32_H
+#ifndef LIB_CRC32_H
+#define LIB_CRC32_H
 
 #include "lib_common.h"
 
 extern u32 crc32_gzip(const void *buffer, size_t size);
 
-#endif /* _LIB_CRC32_H */
+#endif /* LIB_CRC32_H */
diff --git a/lib/deflate_compress.h b/lib/deflate_compress.h
index 9851610..1491e00 100644
--- a/lib/deflate_compress.h
+++ b/lib/deflate_compress.h
@@ -1,5 +1,5 @@
-#ifndef _LIB_DEFLATE_COMPRESS_H
-#define _LIB_DEFLATE_COMPRESS_H
+#ifndef LIB_DEFLATE_COMPRESS_H
+#define LIB_DEFLATE_COMPRESS_H
 
 /* DEFLATE compression is private to deflate_compress.c, but we do need to be
  * able to query the compression level for zlib and gzip header generation.  */
@@ -9,4 +9,4 @@ struct libdeflate_compressor;
 extern unsigned int
 deflate_get_compression_level(struct libdeflate_compressor *c);
 
-#endif /* _LIB_DEFLATE_COMPRESS_H */
+#endif /* LIB_DEFLATE_COMPRESS_H */
diff --git a/lib/deflate_constants.h b/lib/deflate_constants.h
index 898143e..a10b57d 100644
--- a/lib/deflate_constants.h
+++ b/lib/deflate_constants.h
@@ -2,8 +2,8 @@
  * deflate_constants.h - constants for the DEFLATE compression format
  */
 
-#ifndef _LIB_DEFLATE_CONSTANTS_H
-#define _LIB_DEFLATE_CONSTANTS_H
+#ifndef LIB_DEFLATE_CONSTANTS_H
+#define LIB_DEFLATE_CONSTANTS_H
 
 /* Valid block types  */
 #define DEFLATE_BLOCKTYPE_UNCOMPRESSED		0
@@ -63,4 +63,4 @@
 	(DEFLATE_MAX_LITLEN_CODEWORD_LEN + DEFLATE_MAX_EXTRA_LENGTH_BITS + \
 	DEFLATE_MAX_OFFSET_CODEWORD_LEN + DEFLATE_MAX_EXTRA_OFFSET_BITS)
 
-#endif /* _LIB_DEFLATE_CONSTANTS_H */
+#endif /* LIB_DEFLATE_CONSTANTS_H */
diff --git a/lib/gzip_constants.h b/lib/gzip_constants.h
index 5f75043..40dd435 100644
--- a/lib/gzip_constants.h
+++ b/lib/gzip_constants.h
@@ -2,8 +2,8 @@
  * gzip_constants.h - constants for the gzip wrapper format
  */
 
-#ifndef _LIB_GZIP_CONSTANTS_H
-#define _LIB_GZIP_CONSTANTS_H
+#ifndef LIB_GZIP_CONSTANTS_H
+#define LIB_GZIP_CONSTANTS_H
 
 #define GZIP_MIN_HEADER_SIZE	10
 #define GZIP_FOOTER_SIZE	8
@@ -42,4 +42,4 @@
 #define GZIP_OS_RISCOS		13
 #define GZIP_OS_UNKNOWN		255
 
-#endif /* _LIB_GZIP_CONSTANTS_H */
+#endif /* LIB_GZIP_CONSTANTS_H */
diff --git a/lib/lib_common.h b/lib/lib_common.h
index c5a870f..b041ac9 100644
--- a/lib/lib_common.h
+++ b/lib/lib_common.h
@@ -2,8 +2,8 @@
  * lib_common.h - internal header included by all library code
  */
 
-#ifndef _LIB_LIB_COMMON_H
-#define _LIB_LIB_COMMON_H
+#ifndef LIB_LIB_COMMON_H
+#define LIB_LIB_COMMON_H
 
 #define BUILDING_LIBDEFLATE
 
@@ -29,4 +29,4 @@
 #define _x86_cpu_features		SYM_FIXUP(_x86_cpu_features)
 #define x86_setup_cpu_features		SYM_FIXUP(x86_setup_cpu_features)
 
-#endif /* _LIB_LIB_COMMON_H */
+#endif /* LIB_LIB_COMMON_H */
diff --git a/lib/matchfinder_common.h b/lib/matchfinder_common.h
index c4cbd60..34f0dd3 100644
--- a/lib/matchfinder_common.h
+++ b/lib/matchfinder_common.h
@@ -2,8 +2,8 @@
  * matchfinder_common.h - common code for Lempel-Ziv matchfinding
  */
 
-#ifndef _LIB_MATCHFINDER_COMMON_H
-#define _LIB_MATCHFINDER_COMMON_H
+#ifndef LIB_MATCHFINDER_COMMON_H
+#define LIB_MATCHFINDER_COMMON_H
 
 #include "lib_common.h"
 #include "unaligned.h"
@@ -202,4 +202,4 @@ word_differs:
 	return len;
 }
 
-#endif /* _LIB_MATCHFINDER_COMMON_H */
+#endif /* LIB_MATCHFINDER_COMMON_H */
diff --git a/lib/x86_cpu_features.h b/lib/x86_cpu_features.h
index 5b89dc9..fde2473 100644
--- a/lib/x86_cpu_features.h
+++ b/lib/x86_cpu_features.h
@@ -2,8 +2,8 @@
  * x86_cpu_features.h - feature detection for x86 processors
  */
 
-#ifndef _LIB_X86_CPU_FEATURES_H
-#define _LIB_X86_CPU_FEATURES_H
+#ifndef LIB_X86_CPU_FEATURES_H
+#define LIB_X86_CPU_FEATURES_H
 
 #include "lib_common.h"
 
@@ -44,4 +44,4 @@ x86_have_cpu_feature(u32 feature)
 
 #endif /* X86_CPU_FEATURES_ENABLED */
 
-#endif /* _LIB_X86_CPU_FEATURES_H */
+#endif /* LIB_X86_CPU_FEATURES_H */
diff --git a/lib/zlib_constants.h b/lib/zlib_constants.h
index b789b46..f304310 100644
--- a/lib/zlib_constants.h
+++ b/lib/zlib_constants.h
@@ -2,8 +2,8 @@
  * zlib_constants.h - constants for the zlib wrapper format
  */
 
-#ifndef _LIB_ZLIB_CONSTANTS_H
-#define _LIB_ZLIB_CONSTANTS_H
+#ifndef LIB_ZLIB_CONSTANTS_H
+#define LIB_ZLIB_CONSTANTS_H
 
 #define ZLIB_MIN_HEADER_SIZE	2
 #define ZLIB_FOOTER_SIZE	4
@@ -18,4 +18,4 @@
 #define ZLIB_DEFAULT_COMPRESSION	2
 #define ZLIB_SLOWEST_COMPRESSION	3
 
-#endif /* _LIB_ZLIB_CONSTANTS_H */
+#endif /* LIB_ZLIB_CONSTANTS_H */
diff --git a/programs/detect.sh b/programs/detect.sh
index 05bc3a3..7e310a0 100755
--- a/programs/detect.sh
+++ b/programs/detect.sh
@@ -5,8 +5,8 @@ if [ -z "$CC" ]; then
 fi
 
 echo "/* THIS FILE WAS AUTOMATICALLY GENERATED.  DO NOT EDIT. */"
-echo "#ifndef _CONFIG_H"
-echo "#define _CONFIG_H"
+echo "#ifndef CONFIG_H"
+echo "#define CONFIG_H"
 
 tmpfile="$(mktemp -t libdeflate_config.XXXXXXXX)"
 trap "rm -f \"$tmpfile\"" EXIT
@@ -31,4 +31,4 @@ check_function posix_fadvise
 check_function posix_madvise
 
 echo
-echo "#endif /* _CONFIG_H */"
+echo "#endif /* CONFIG_H */"