Renamed header file identifiers using C/C++ reserved name structure.

Adjust clang CI run to report warning about reserved identifiers.

.gitlab-ci.yml

@@ -50,6 +50,7 @@ autotools-clang:
     - make distcheck
   variables:
     INSTALL_COMPILER: clang
+    CONFIG_FLAGS: CFLAGS=-Wreserved-identifier
     CC: clang
 
 autotools-disable-encoding:

include/theora/codec.h

@@ -61,8 +61,8 @@
  * The shared <tt>libtheoradec</tt> and <tt>libtheoraenc</tt> C API.
  * You don't need to include this directly.*/
 
-#if !defined(_O_THEORA_CODEC_H_)
-# define _O_THEORA_CODEC_H_ (1)
+#if !defined(OGG_THEORA_CODEC_HEADER)
+# define OGG_THEORA_CODEC_HEADER (1)
 # include <ogg/ogg.h>
 
 #if defined(__cplusplus)
@@ -602,4 +602,4 @@ extern void th_comment_clear(th_comment *_tc);
 }
 #endif
 
-#endif
+#endif /* OGG_THEORA_CODEC_HEADER */

include/theora/theora.h

@@ -14,8 +14,8 @@
 
  ********************************************************************/
 
-#ifndef _O_THEORA_H_
-#define _O_THEORA_H_
+#ifndef OGG_THEORA_HEADER
+#define OGG_THEORA_HEADER
 
 #ifdef __cplusplus
 extern "C"
@@ -782,4 +782,4 @@ extern int theora_control(theora_state *th,int req,void *buf,size_t buf_sz);
 }
 #endif /* __cplusplus */
 
-#endif /* _O_THEORA_H_ */
+#endif /* OGG_THEORA_HEADER */

include/theora/theoradec.h

@@ -17,8 +17,8 @@
 /**\file
  * The <tt>libtheoradec</tt> C decoding API.*/
 
-#if !defined(_O_THEORA_THEORADEC_H_)
-# define _O_THEORA_THEORADEC_H_ (1)
+#if !defined(OGG_THEORA_THEORADEC_HEADER)
+# define OGG_THEORA_THEORADEC_HEADER (1)
 # include <stddef.h>
 # include <ogg/ogg.h>
 # include "codec.h"
@@ -329,4 +329,4 @@ extern void th_decode_free(th_dec_ctx *_dec);
 }
 #endif
 
-#endif
+#endif /* OGG_THEORA_THEORADEC_HEADER */

include/theora/theoraenc.h

@@ -17,8 +17,8 @@
 /**\file
  * The <tt>libtheoraenc</tt> C encoding API.*/
 
-#if !defined(_O_THEORA_THEORAENC_H_)
-# define _O_THEORA_THEORAENC_H_ (1)
+#if !defined(OGG_THEORA_THEORAENC_HEADER)
+# define OGG_THEORA_THEORAENC_HEADER (1)
 # include <stddef.h>
 # include <ogg/ogg.h>
 # include "codec.h"
@@ -544,4 +544,4 @@ extern void th_encode_free(th_enc_ctx *_enc);
 }
 #endif
 
-#endif
+#endif /* OGG_THEORA_THEORAENC_HEADER */