diff options
| author | Chris Robinson <[email protected]> | 2012-02-19 12:07:40 -0800 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2012-02-19 12:07:40 -0800 |
| commit | 4a65747a4b20cbbfb2627bf10ded6f5b897cb908 (patch) | |
| tree | 9a8c3bc309514340dd8795db8904fe51fd8d3803 /OpenAL32 | |
| parent | 6dc194ed1defc358c9ed4ee8a67db71f5c040766 (diff) | |
Add a COUNTOF macro to get the number of entries in a static array
Diffstat (limited to 'OpenAL32')
| -rw-r--r-- | OpenAL32/Include/alMain.h | 1 | ||||
| -rw-r--r-- | OpenAL32/alBuffer.c | 4 | ||||
| -rw-r--r-- | OpenAL32/alEffect.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h index 8427f83b..490721be 100644 --- a/OpenAL32/Include/alMain.h +++ b/OpenAL32/Include/alMain.h @@ -105,6 +105,7 @@ static const union { } EndianTest = { 1 }; #define IS_LITTLE_ENDIAN (EndianTest.b[0] == 1) +#define COUNTOF(x) (sizeof((x))/sizeof((x)[0])) #ifdef _WIN32 diff --git a/OpenAL32/alBuffer.c b/OpenAL32/alBuffer.c index 6a3bb114..5a0e1dee 100644 --- a/OpenAL32/alBuffer.c +++ b/OpenAL32/alBuffer.c @@ -2136,7 +2136,7 @@ static ALboolean DecomposeUserFormat(ALenum format, enum UserFmtChannels *chans, }; ALuint i; - for(i = 0;i < sizeof(list)/sizeof(list[0]);i++) + for(i = 0;i < COUNTOF(list);i++) { if(list[i].format == format) { @@ -2213,7 +2213,7 @@ static ALboolean DecomposeFormat(ALenum format, enum FmtChannels *chans, enum Fm }; ALuint i; - for(i = 0;i < sizeof(list)/sizeof(list[0]);i++) + for(i = 0;i < COUNTOF(list);i++) { if(list[i].format == format) { diff --git a/OpenAL32/alEffect.c b/OpenAL32/alEffect.c index 4e04089c..aebda3c7 100644 --- a/OpenAL32/alEffect.c +++ b/OpenAL32/alEffect.c @@ -1449,7 +1449,7 @@ static const struct { DECL(SMALLWATERROOM), }; #undef DECL -static const ALsizei reverblistsize = sizeof(reverblist)/sizeof(reverblist[0]); +static const ALsizei reverblistsize = COUNTOF(reverblist); ALvoid GetReverbEffect(const char *name, ALeffect *effect) { |