ref: 61fb3b16894c8fff523efb4255247d151ed5bad5
parent: d53531d0bd600e9d1d2400bb801cb381245321c4
author: Jean-Marc Valin <jmvalin@jmvalin.ca>
date: Sun Oct 29 17:19:51 EDT 2023
Don't use reserved identifiers for include guards
--- a/celt/mips/celt_mipsr1.h
+++ b/celt/mips/celt_mipsr1.h
@@ -27,8 +27,8 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef __CELT_MIPSR1_H__
-#define __CELT_MIPSR1_H__
+#ifndef CELT_MIPSR1_H__
+#define CELT_MIPSR1_H__
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -149,4 +149,4 @@
}
}
-#endif /* __CELT_MIPSR1_H__ */
+#endif /* CELT_MIPSR1_H__ */
--- a/celt/mips/mdct_mipsr1.h
+++ b/celt/mips/mdct_mipsr1.h
@@ -38,8 +38,8 @@
MDCT implementation in FFMPEG, but has differences in signs, ordering
and scaling in many places.
*/
-#ifndef __MDCT_MIPSR1_H__
-#define __MDCT_MIPSR1_H__
+#ifndef MDCT_MIPSR1_H__
+#define MDCT_MIPSR1_H__
#ifndef SKIP_CONFIG_H
#ifdef HAVE_CONFIG_H
@@ -285,4 +285,4 @@
}
}
}
-#endif /* __MDCT_MIPSR1_H__ */
+#endif /* MDCT_MIPSR1_H__ */
--- a/celt/mips/vq_mipsr1.h
+++ b/celt/mips/vq_mipsr1.h
@@ -26,8 +26,8 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef __VQ_MIPSR1_H__
-#define __VQ_MIPSR1_H__
+#ifndef VQ_MIPSR1_H__
+#define VQ_MIPSR1_H__
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -113,4 +113,4 @@
/*return celt_sqrt(E);*/
}
-#endif /* __VQ_MIPSR1_H__ */
+#endif /* VQ_MIPSR1_H__ */
--- a/dnn/dred_rdovae_dec.h
+++ b/dnn/dred_rdovae_dec.h
@@ -25,8 +25,8 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _DRED_RDOVAE_DEC_H
-#define _DRED_RDOVAE_DEC_H
+#ifndef DRED_RDOVAE_DEC_H
+#define DRED_RDOVAE_DEC_H
#include "dred_rdovae.h"
#include "dred_rdovae_dec_data.h"
--- a/dnn/dred_rdovae_enc.h
+++ b/dnn/dred_rdovae_enc.h
@@ -25,8 +25,8 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _DRED_RDOVAE_ENC_H
-#define _DRED_RDOVAE_ENC_H
+#ifndef DRED_RDOVAE_ENC_H
+#define DRED_RDOVAE_ENC_H
#include "dred_rdovae.h"
--- a/dnn/lpcnet.h
+++ b/dnn/lpcnet.h
@@ -24,8 +24,8 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _LPCNET_H_
-#define _LPCNET_H_
+#ifndef LPCNET_H_
+#define LPCNET_H_
#include "opus_types.h"
--- a/dnn/nnet.h
+++ b/dnn/nnet.h
@@ -25,8 +25,8 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _NNET_H_
-#define _NNET_H_
+#ifndef NNET_H_
+#define NNET_H_
#include <stddef.h>
#include "opus_types.h"
@@ -189,4 +189,4 @@
void compute_conv2d(const Conv2dLayer *conv, float *out, float *mem, const float *in, int height, int hstride, int activation);
-#endif /* _MLP_H_ */
+#endif /* NNET_H_ */
--- a/dnn/training_tf2/fec_packets.h
+++ b/dnn/training_tf2/fec_packets.h
@@ -25,10 +25,10 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _FEC_PACKETS_H
-#define _FEC_PACKETS_H
+#ifndef FEC_PACKETS_H
+#define FEC_PACKETS_H
int get_fec_frame(const char * const filename, float *features, int packet_index, int subframe_index);
int get_fec_rate(const char * const filename, int packet_index);
-#endif
\ No newline at end of file
+#endif
--- a/silk/mips/NSQ_del_dec_mipsr1.h
+++ b/silk/mips/NSQ_del_dec_mipsr1.h
@@ -25,8 +25,8 @@
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#ifndef __NSQ_DEL_DEC_MIPSR1_H__
-#define __NSQ_DEL_DEC_MIPSR1_H__
+#ifndef NSQ_DEL_DEC_MIPSR1_H__
+#define NSQ_DEL_DEC_MIPSR1_H__
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -407,4 +407,4 @@
}
}
-#endif /* __NSQ_DEL_DEC_MIPSR1_H__ */
+#endif /* NSQ_DEL_DEC_MIPSR1_H__ */
--- a/silk/mips/macros_mipsr1.h
+++ b/silk/mips/macros_mipsr1.h
@@ -26,8 +26,8 @@
***********************************************************************/
-#ifndef __SILK_MACROS_MIPSR1_H__
-#define __SILK_MACROS_MIPSR1_H__
+#ifndef SILK_MACROS_MIPSR1_H__
+#define SILK_MACROS_MIPSR1_H__
#define mips_clz(x) __builtin_clz(x)
@@ -89,4 +89,4 @@
return re32;
}
-#endif /* __SILK_MACROS_MIPSR1_H__ */
+#endif /* SILK_MACROS_MIPSR1_H__ */
--- a/src/mlp.h
+++ b/src/mlp.h
@@ -24,8 +24,8 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _MLP_H_
-#define _MLP_H_
+#ifndef MLP_H_
+#define MLP_H_
#include "opus_types.h"
@@ -57,4 +57,4 @@
void analysis_compute_gru(const AnalysisGRULayer *gru, float *state, const float *input);
-#endif /* _MLP_H_ */
+#endif /* MLP_H_ */
--
⑨