Remove leading double underscores from include guard defines

A symbol starting with two leading underscores is reserved for
the compiler/standard library implementation.

Also remove the trailing two double underscores for consistency
and symmetry.

6 files changed, 18 insertions, 18 deletions

diff --git a/include/common/attributes.h b/include/common/attributes.h
index e3f538c..a9fd0fa 100644
--- a/include/common/attributes.h
+++ b/include/common/attributes.h
@@ -25,8 +25,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __DAV1D_COMMON_ATTRIBUTES_H__
-#define __DAV1D_COMMON_ATTRIBUTES_H__
+#ifndef DAV1D_COMMON_ATTRIBUTES_H
+#define DAV1D_COMMON_ATTRIBUTES_H
 
 #include "config.h"
 
@@ -139,4 +139,4 @@ static inline int clzll(const unsigned long long mask) {
 }
 #endif /* !_MSC_VER */
 
-#endif /* __DAV1D_COMMON_ATTRIBUTES_H__ */
+#endif /* DAV1D_COMMON_ATTRIBUTES_H */
diff --git a/include/common/bitdepth.h b/include/common/bitdepth.h
index f150715..f13d8ca 100644
--- a/include/common/bitdepth.h
+++ b/include/common/bitdepth.h
@@ -25,8 +25,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __DAV1D_COMMON_BITDEPTH_H__
-#define __DAV1D_COMMON_BITDEPTH_H__
+#ifndef DAV1D_COMMON_BITDEPTH_H
+#define DAV1D_COMMON_BITDEPTH_H
 
 #include <stdint.h>
 #include <string.h>
@@ -77,4 +77,4 @@ static inline void pixel_set(pixel *const dst, const int val, const int num) {
 name##_8bpc(__VA_ARGS__); \
 name##_16bpc(__VA_ARGS__)
 
-#endif /* __DAV1D_COMMON_BITDEPTH_H__ */
+#endif /* DAV1D_COMMON_BITDEPTH_H */
diff --git a/include/common/dump.h b/include/common/dump.h
index e76fe1f..4d2b1ba 100644
--- a/include/common/dump.h
+++ b/include/common/dump.h
@@ -25,8 +25,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __DAV1D_COMMON_DUMP_H__
-#define __DAV1D_COMMON_DUMP_H__
+#ifndef DAV1D_COMMON_DUMP_H
+#define DAV1D_COMMON_DUMP_H
 
 #include <stddef.h>
 #include <stdint.h>
@@ -83,4 +83,4 @@ static inline void ac_dump(const int16_t *buf, int w, int h, const char *what)
     }
 }
 
-#endif /* __DAV1D_COMMON_DUMP_H__ */
+#endif /* DAV1D_COMMON_DUMP_H */
diff --git a/include/common/intops.h b/include/common/intops.h
index 62c46af..119caab 100644
--- a/include/common/intops.h
+++ b/include/common/intops.h
@@ -25,8 +25,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __DAV1D_COMMON_INTOPS_H__
-#define __DAV1D_COMMON_INTOPS_H__
+#ifndef DAV1D_COMMON_INTOPS_H
+#define DAV1D_COMMON_INTOPS_H
 
 #include <stdint.h>
 
@@ -73,4 +73,4 @@ static inline unsigned inv_recenter(const unsigned r, const unsigned v) {
         return r - ((v + 1) >> 1);
 }
 
-#endif /* __DAV1D_COMMON_INTOPS_H__ */
+#endif /* DAV1D_COMMON_INTOPS_H */
diff --git a/include/common/mem.h b/include/common/mem.h
index d68639f..3fbcdbc 100644
--- a/include/common/mem.h
+++ b/include/common/mem.h
@@ -25,8 +25,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __DAV1D_COMMON_MEM_H__
-#define __DAV1D_COMMON_MEM_H__
+#ifndef DAV1D_COMMON_MEM_H
+#define DAV1D_COMMON_MEM_H
 
 #include <assert.h>
 #include <stdlib.h>
@@ -80,4 +80,4 @@ static inline void freep(void *ptr) {
     }
 }
 
-#endif /* __DAV1D_COMMON_MEM_H__ */
+#endif /* DAV1D_COMMON_MEM_H */
diff --git a/include/common/validate.h b/include/common/validate.h
index 9114740..3096f3d 100644
--- a/include/common/validate.h
+++ b/include/common/validate.h
@@ -25,8 +25,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __DAV1D_COMMON_VALIDATE_H__
-#define __DAV1D_COMMON_VALIDATE_H__
+#ifndef DAV1D_COMMON_VALIDATE_H
+#define DAV1D_COMMON_VALIDATE_H
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -56,4 +56,4 @@
 
 #define validate_input(x) validate_input_or_ret(x, )
 
-#endif /* __DAV1D_COMMON_VALIDATE_H__ */
+#endif /* DAV1D_COMMON_VALIDATE_H */