Skip to content

Commit 6353b7b

Browse files
changed to the more portable atomic syntax
1 parent 3b12e4e commit 6353b7b

File tree

11 files changed

+31
-31
lines changed

11 files changed

+31
-31
lines changed

examples/include/_common.h

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -243,17 +243,17 @@ typedef enum {
243243
#define MAX_NUM_SH_SIGNALS ( MAX_NUM_CHANNELS )
244244

245245
#ifndef __STDC_NO_ATOMICS__
246-
typedef _Atomic(CH_ORDER) _Atomic_CH_ORDER;
247-
typedef _Atomic(NORM_TYPES) _Atomic_NORM_TYPES;
248-
typedef _Atomic(SH_ORDERS) _Atomic_SH_ORDERS;
249-
typedef _Atomic(MIC_PRESETS) _Atomic_MIC_PRESETS;
250-
typedef _Atomic(LOUDSPEAKER_ARRAY_PRESETS) _Atomic_LOUDSPEAKER_ARRAY_PRESETS;
251-
typedef _Atomic(SOURCE_CONFIG_PRESETS) _Atomic_SOURCE_CONFIG_PRESETS;
252-
typedef _Atomic(STATIC_BEAM_TYPES) _Atomic_STATIC_BEAM_TYPES;
253-
typedef _Atomic(HFOV_OPTIONS) _Atomic_HFOV_OPTIONS;
254-
typedef _Atomic(ASPECT_RATIO_OPTIONS) _Atomic_ASPECT_RATIO_OPTIONS;
255-
typedef _Atomic(CODEC_STATUS) _Atomic_CODEC_STATUS;
256-
typedef _Atomic(PROC_STATUS) _Atomic_PROC_STATUS;
246+
typedef _Atomic CH_ORDER _Atomic_CH_ORDER;
247+
typedef _Atomic NORM_TYPES _Atomic_NORM_TYPES;
248+
typedef _Atomic SH_ORDERS _Atomic_SH_ORDERS;
249+
typedef _Atomic MIC_PRESETS _Atomic_MIC_PRESETS;
250+
typedef _Atomic LOUDSPEAKER_ARRAY_PRESETS _Atomic_LOUDSPEAKER_ARRAY_PRESETS;
251+
typedef _Atomic SOURCE_CONFIG_PRESETS _Atomic_SOURCE_CONFIG_PRESETS;
252+
typedef _Atomic STATIC_BEAM_TYPES _Atomic_STATIC_BEAM_TYPES;
253+
typedef _Atomic HFOV_OPTIONS _Atomic_HFOV_OPTIONS;
254+
typedef _Atomic ASPECT_RATIO_OPTIONS _Atomic_ASPECT_RATIO_OPTIONS;
255+
typedef _Atomic CODEC_STATUS _Atomic_CODEC_STATUS;
256+
typedef _Atomic PROC_STATUS _Atomic_PROC_STATUS;
257257
#else
258258
typedef CH_ORDER _Atomic_CH_ORDER;
259259
typedef NORM_TYPES _Atomic_NORM_TYPES;

examples/src/ambi_bin/ambi_bin_internal.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ extern "C" {
7878
#endif
7979

8080
#ifndef __STDC_NO_ATOMICS__
81-
typedef _Atomic(AMBI_BIN_PREPROC) _Atomic_AMBI_BIN_PREPROC;
82-
typedef _Atomic(AMBI_BIN_DECODING_METHODS) _Atomic_AMBI_BIN_DECODING_METHODS;
81+
typedef _Atomic AMBI_BIN_PREPROC _Atomic_AMBI_BIN_PREPROC;
82+
typedef _Atomic AMBI_BIN_DECODING_METHODS _Atomic_AMBI_BIN_DECODING_METHODS;
8383
#else
8484
typedef AMBI_BIN_PREPROC _Atomic_AMBI_BIN_PREPROC;
8585
typedef AMBI_BIN_DECODING_METHODS _Atomic_AMBI_BIN_DECODING_METHODS;

examples/src/ambi_dec/ambi_dec_internal.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ extern "C" {
7878
#endif
7979

8080
#ifndef __STDC_NO_ATOMICS__
81-
typedef _Atomic(AMBI_DEC_DECODING_METHODS) _Atomic_AMBI_DEC_DECODING_METHODS;
82-
typedef _Atomic(AMBI_DEC_DIFFUSE_FIELD_EQ_APPROACH) _Atomic_AMBI_DEC_DIFFUSE_FIELD_EQ_APPROACH;
81+
typedef _Atomic AMBI_DEC_DECODING_METHODS _Atomic_AMBI_DEC_DECODING_METHODS;
82+
typedef _Atomic AMBI_DEC_DIFFUSE_FIELD_EQ_APPROACH _Atomic_AMBI_DEC_DIFFUSE_FIELD_EQ_APPROACH;
8383
#else
8484
typedef AMBI_DEC_DECODING_METHODS _Atomic_AMBI_DEC_DECODING_METHODS;
8585
typedef AMBI_DEC_DIFFUSE_FIELD_EQ_APPROACH _Atomic_AMBI_DEC_DIFFUSE_FIELD_EQ_APPROACH;

examples/src/array2sh/array2sh_internal.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,11 @@ extern "C" {
8282
#endif
8383

8484
#ifndef __STDC_NO_ATOMICS__
85-
typedef _Atomic(ARRAY2SH_MICROPHONE_ARRAY_PRESETS) _Atomic_ARRAY2SH_MICROPHONE_ARRAY_PRESETS;
86-
typedef _Atomic(ARRAY2SH_FILTER_TYPES) _Atomic_ARRAY2SH_FILTER_TYPES;
87-
typedef _Atomic(ARRAY2SH_ARRAY_TYPES) _Atomic_ARRAY2SH_ARRAY_TYPES;
88-
typedef _Atomic(ARRAY2SH_WEIGHT_TYPES) _Atomic_ARRAY2SH_WEIGHT_TYPES;
89-
typedef _Atomic(ARRAY2SH_EVAL_STATUS) _Atomic_ARRAY2SH_EVAL_STATUS;
85+
typedef _Atomic ARRAY2SH_MICROPHONE_ARRAY_PRESETS _Atomic_ARRAY2SH_MICROPHONE_ARRAY_PRESETS;
86+
typedef _Atomic ARRAY2SH_FILTER_TYPES _Atomic_ARRAY2SH_FILTER_TYPES;
87+
typedef _Atomic ARRAY2SH_ARRAY_TYPES _Atomic_ARRAY2SH_ARRAY_TYPES;
88+
typedef _Atomic ARRAY2SH_WEIGHT_TYPES _Atomic_ARRAY2SH_WEIGHT_TYPES;
89+
typedef _Atomic ARRAY2SH_EVAL_STATUS _Atomic_ARRAY2SH_EVAL_STATUS;
9090
#else
9191
typedef ARRAY2SH_MICROPHONE_ARRAY_PRESETS _Atomic_ARRAY2SH_MICROPHONE_ARRAY_PRESETS;
9292
typedef ARRAY2SH_FILTER_TYPES _Atomic_ARRAY2SH_FILTER_TYPES;

examples/src/binauraliser/binauraliser_internal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ extern "C" {
6262
#endif
6363

6464
#ifndef __STDC_NO_ATOMICS__
65-
typedef _Atomic(INTERP_MODES) _Atomic_INTERP_MODES;
65+
typedef _Atomic INTERP_MODES _Atomic_INTERP_MODES;
6666
#else
6767
typedef INTERP_MODES _Atomic_INTERP_MODES;
6868
#endif

examples/src/dirass/dirass_internal.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ extern "C" {
6262
#define NUM_DISP_SLOTS ( 2 ) /**< Number of display slots */
6363

6464
#ifndef __STDC_NO_ATOMICS__
65-
typedef _Atomic(DIRASS_UPSCALE_ORDERS) _Atomic_DIRASS_UPSCALE_ORDERS;
66-
typedef _Atomic(DIRASS_GRID_OPTIONS) _Atomic_DIRASS_GRID_OPTIONS;
67-
typedef _Atomic(DIRASS_REASS_MODES) _Atomic_DIRASS_REASS_MODES;
65+
typedef _Atomic DIRASS_UPSCALE_ORDERS _Atomic_DIRASS_UPSCALE_ORDERS;
66+
typedef _Atomic DIRASS_GRID_OPTIONS _Atomic_DIRASS_GRID_OPTIONS;
67+
typedef _Atomic DIRASS_REASS_MODES _Atomic_DIRASS_REASS_MODES;
6868
#else
6969
typedef DIRASS_UPSCALE_ORDERS _Atomic_DIRASS_UPSCALE_ORDERS;
7070
typedef DIRASS_GRID_OPTIONS _Atomic_DIRASS_GRID_OPTIONS;

examples/src/pitch_shifter/pitch_shifter_internal.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ extern "C" {
4747
#endif
4848

4949
#ifndef __STDC_NO_ATOMICS__
50-
typedef _Atomic(PITCH_SHIFTER_FFTSIZE_OPTIONS) _Atomic_PITCH_SHIFTER_FFTSIZE_OPTIONS;
51-
typedef _Atomic(PITCH_SHIFTER_OSAMP_OPTIONS) _Atomic_PITCH_SHIFTER_OSAMP_OPTIONS;
50+
typedef _Atomic PITCH_SHIFTER_FFTSIZE_OPTIONS _Atomic_PITCH_SHIFTER_FFTSIZE_OPTIONS;
51+
typedef _Atomic PITCH_SHIFTER_OSAMP_OPTIONS _Atomic_PITCH_SHIFTER_OSAMP_OPTIONS;
5252
#else
5353
typedef PITCH_SHIFTER_FFTSIZE_OPTIONS _Atomic_PITCH_SHIFTER_FFTSIZE_OPTIONS;
5454
typedef PITCH_SHIFTER_OSAMP_OPTIONS _Atomic_PITCH_SHIFTER_OSAMP_OPTIONS;

examples/src/powermap/powermap_internal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ extern "C" {
6363
#endif
6464

6565
#ifndef __STDC_NO_ATOMICS__
66-
typedef _Atomic(POWERMAP_MODES) _Atomic_POWERMAP_MODES;
66+
typedef _Atomic POWERMAP_MODES _Atomic_POWERMAP_MODES;
6767
#else
6868
typedef POWERMAP_MODES _Atomic_POWERMAP_MODES;
6969
#endif

examples/src/rotator/rotator_internal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ typedef enum {
6666
} M_ROT_STATUS;
6767

6868
#ifndef __STDC_NO_ATOMICS__
69-
typedef _Atomic(M_ROT_STATUS) _Atomic_M_ROT_STATUS;
69+
typedef _Atomic M_ROT_STATUS _Atomic_M_ROT_STATUS;
7070
#else
7171
typedef M_ROT_STATUS _Atomic_M_ROT_STATUS;
7272
#endif

examples/src/spreader/spreader_internal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ extern "C" {
6262
#endif
6363

6464
#ifndef __STDC_NO_ATOMICS__
65-
typedef _Atomic(SPREADER_PROC_MODES) _Atomic_SPREADER_PROC_MODES;
65+
typedef _Atomic SPREADER_PROC_MODES _Atomic_SPREADER_PROC_MODES;
6666
#else
6767
typedef SPREADER_PROC_MODES _Atomic_SPREADER_PROC_MODES;
6868
#endif

0 commit comments

Comments
 (0)