From cc9372b7e0f848405e37d51587916c4ec7f636a3 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 10 Dec 2013 12:59:04 +1100 Subject: DNA Deprecation: add DNA_DEPRECATED_GCC_POISON for enum/structs. also fully remove freestyle raycasting_algorithm --- source/blender/makesdna/DNA_sound_types.h | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) (limited to 'source/blender/makesdna/DNA_sound_types.h') diff --git a/source/blender/makesdna/DNA_sound_types.h b/source/blender/makesdna/DNA_sound_types.h index 040942d6cea..d7a51359777 100644 --- a/source/blender/makesdna/DNA_sound_types.h +++ b/source/blender/makesdna/DNA_sound_types.h @@ -33,6 +33,7 @@ #ifndef __DNA_SOUND_TYPES_H__ #define __DNA_SOUND_TYPES_H__ +#include "DNA_defs.h" #include "DNA_ID.h" /* stupid... could easily be solved */ @@ -109,14 +110,21 @@ typedef enum eSound_Type { #endif /* spacesound->flag */ -#define SND_DRAWFRAMES 1 -#define SND_CFRA_NUM 2 - -#define SOUND_FLAGS_3D (1 << 3) /* deprecated! used for sound actuator loading */ -#define SOUND_FLAGS_CACHING (1 << 4) -#define SOUND_FLAGS_MONO (1 << 5) +enum { + SND_DRAWFRAMES = 1, + SND_CFRA_NUM = 2, +}; + +enum { + SOUND_FLAGS_3D = (1 << 3), /* deprecated! used for sound actuator loading */ + SOUND_FLAGS_CACHING = (1 << 4), + SOUND_FLAGS_MONO = (1 << 5), +}; + +#if (DNA_DEPRECATED_GCC_POISON == 1) +#pragma GCC poison SOUND_FLAGS_3D +#endif /* to DNA_sound_types.h*/ #endif - -- cgit v1.2.3