diff options
author | Martin Storsjö <martin@martin.st> | 2019-02-13 17:02:54 +0300 |
---|---|---|
committer | Martin Storsjö <martin@martin.st> | 2019-02-13 17:09:03 +0300 |
commit | c45f6b379d98c3b32dfa7abda74434978aa94094 (patch) | |
tree | c4f5984c877768c70b01905425df37821e80f4e3 /include | |
parent | 53025a2b32f35878c1c6c00bef4a51f239631955 (diff) |
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.
Diffstat (limited to 'include')
-rw-r--r-- | include/common/attributes.h | 6 | ||||
-rw-r--r-- | include/common/bitdepth.h | 6 | ||||
-rw-r--r-- | include/common/dump.h | 6 | ||||
-rw-r--r-- | include/common/intops.h | 6 | ||||
-rw-r--r-- | include/common/mem.h | 6 | ||||
-rw-r--r-- | include/common/validate.h | 6 | ||||
-rw-r--r-- | include/dav1d/common.h | 6 | ||||
-rw-r--r-- | include/dav1d/data.h | 6 | ||||
-rw-r--r-- | include/dav1d/dav1d.h | 6 | ||||
-rw-r--r-- | include/dav1d/headers.h | 6 | ||||
-rw-r--r-- | include/dav1d/picture.h | 6 |
11 files changed, 33 insertions, 33 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 */ diff --git a/include/dav1d/common.h b/include/dav1d/common.h index 83257fc..5223f1e 100644 --- a/include/dav1d/common.h +++ b/include/dav1d/common.h @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_COMMON_H__ -#define __DAV1D_COMMON_H__ +#ifndef DAV1D_COMMON_H +#define DAV1D_COMMON_H #include <stddef.h> #include <stdint.h> @@ -67,4 +67,4 @@ typedef struct Dav1dDataProps { struct Dav1dUserData user_data; ///< user-configurable data, default NULL members } Dav1dDataProps; -#endif /* __DAV1D_COMMON_H__ */ +#endif /* DAV1D_COMMON_H */ diff --git a/include/dav1d/data.h b/include/dav1d/data.h index 63f21fd..7fba991 100644 --- a/include/dav1d/data.h +++ b/include/dav1d/data.h @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_DATA_H__ -#define __DAV1D_DATA_H__ +#ifndef DAV1D_DATA_H +#define DAV1D_DATA_H #include <stddef.h> #include <stdint.h> @@ -106,4 +106,4 @@ DAV1D_API int dav1d_data_wrap_user_data(Dav1dData *data, */ DAV1D_API void dav1d_data_unref(Dav1dData *data); -#endif /* __DAV1D_DATA_H__ */ +#endif /* DAV1D_DATA_H */ diff --git a/include/dav1d/dav1d.h b/include/dav1d/dav1d.h index 82f0a2c..af94804 100644 --- a/include/dav1d/dav1d.h +++ b/include/dav1d/dav1d.h @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_H__ -#define __DAV1D_H__ +#ifndef DAV1D_H +#define DAV1D_H #ifdef __cplusplus extern "C" { @@ -201,4 +201,4 @@ DAV1D_API void dav1d_flush(Dav1dContext *c); } # endif -#endif /* __DAV1D_H__ */ +#endif /* DAV1D_H */ diff --git a/include/dav1d/headers.h b/include/dav1d/headers.h index f50a82e..2152650 100644 --- a/include/dav1d/headers.h +++ b/include/dav1d/headers.h @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_HEADERS_H__ -#define __DAV1D_HEADERS_H__ +#ifndef DAV1D_HEADERS_H +#define DAV1D_HEADERS_H // Constants from Section 3. "Symbols and abbreviated terms" #define DAV1D_MAX_CDEF_STRENGTHS 8 @@ -382,4 +382,4 @@ typedef struct Dav1dFrameHeader { Dav1dWarpedMotionParams gmv[DAV1D_REFS_PER_FRAME]; } Dav1dFrameHeader; -#endif /* __DAV1D_HEADERS_H__ */ +#endif /* DAV1D_HEADERS_H */ diff --git a/include/dav1d/picture.h b/include/dav1d/picture.h index 7627f4d..f4354b1 100644 --- a/include/dav1d/picture.h +++ b/include/dav1d/picture.h @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_PICTURE_H__ -#define __DAV1D_PICTURE_H__ +#ifndef DAV1D_PICTURE_H +#define DAV1D_PICTURE_H #include <stddef.h> #include <stdint.h> @@ -108,4 +108,4 @@ typedef struct Dav1dPicAllocator { */ DAV1D_API void dav1d_picture_unref(Dav1dPicture *p); -#endif /* __DAV1D_PICTURE_H__ */ +#endif /* DAV1D_PICTURE_H */ |