diff options
| -rw-r--r-- | Alc/ALc.c | 8 | ||||
| -rw-r--r-- | Alc/panning.c | 2 | ||||
| -rw-r--r-- | OpenAL32/Include/alBuffer.h | 8 | ||||
| -rw-r--r-- | OpenAL32/Include/alMain.h | 10 | ||||
| -rw-r--r-- | OpenAL32/alBuffer.c | 8 |
5 files changed, 17 insertions, 19 deletions
@@ -1334,8 +1334,8 @@ ALuint ChannelsFromDevFmt(enum DevFmtChannels chans) return 0; } -DECL_CONST static ALboolean DecomposeDevFormat(ALenum format, - enum DevFmtChannels *chans, enum DevFmtType *type) +static ALboolean DecomposeDevFormat(ALenum format, enum DevFmtChannels *chans, + enum DevFmtType *type) { static const struct { ALenum format; @@ -1381,7 +1381,7 @@ DECL_CONST static ALboolean DecomposeDevFormat(ALenum format, return AL_FALSE; } -DECL_CONST static ALCboolean IsValidALCType(ALCenum type) +static ALCboolean IsValidALCType(ALCenum type) { switch(type) { @@ -1397,7 +1397,7 @@ DECL_CONST static ALCboolean IsValidALCType(ALCenum type) return ALC_FALSE; } -DECL_CONST static ALCboolean IsValidALCChannels(ALCenum channels) +static ALCboolean IsValidALCChannels(ALCenum channels) { switch(channels) { diff --git a/Alc/panning.c b/Alc/panning.c index 172861da..1162bbbc 100644 --- a/Alc/panning.c +++ b/Alc/panning.c @@ -290,7 +290,7 @@ void ComputeFirstOrderGainsBF(const BFChannelConfig *chanmap, ALuint numchans, c } -DECL_CONST static inline const char *GetLabelFromChannel(enum Channel channel) +static inline const char *GetLabelFromChannel(enum Channel channel) { switch(channel) { diff --git a/OpenAL32/Include/alBuffer.h b/OpenAL32/Include/alBuffer.h index 351c81bc..e99af050 100644 --- a/OpenAL32/Include/alBuffer.h +++ b/OpenAL32/Include/alBuffer.h @@ -36,8 +36,8 @@ enum UserFmtChannels { UserFmtBFormat3D = AL_BFORMAT3D_SOFT, /* WXYZ */ }; -ALuint BytesFromUserFmt(enum UserFmtType type) DECL_CONST; -ALuint ChannelsFromUserFmt(enum UserFmtChannels chans) DECL_CONST; +ALuint BytesFromUserFmt(enum UserFmtType type); +ALuint ChannelsFromUserFmt(enum UserFmtChannels chans); inline ALuint FrameSizeFromUserFmt(enum UserFmtChannels chans, enum UserFmtType type) { return ChannelsFromUserFmt(chans) * BytesFromUserFmt(type); @@ -63,8 +63,8 @@ enum FmtChannels { }; #define MAX_INPUT_CHANNELS (8) -ALuint BytesFromFmt(enum FmtType type) DECL_CONST; -ALuint ChannelsFromFmt(enum FmtChannels chans) DECL_CONST; +ALuint BytesFromFmt(enum FmtType type); +ALuint ChannelsFromFmt(enum FmtChannels chans); inline ALuint FrameSizeFromFmt(enum FmtChannels chans, enum FmtType type) { return ChannelsFromFmt(chans) * BytesFromFmt(type); diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h index c6b816d9..d7975cea 100644 --- a/OpenAL32/Include/alMain.h +++ b/OpenAL32/Include/alMain.h @@ -163,10 +163,8 @@ typedef ALuint64SOFT ALuint64; #endif #ifdef __GNUC__ -#define DECL_CONST __attribute__((const)) #define DECL_FORMAT(x, y, z) __attribute__((format(x, (y), (z)))) #else -#define DECL_CONST #define DECL_FORMAT(x, y, z) #endif @@ -467,8 +465,8 @@ enum DevFmtChannels { }; #define MAX_OUTPUT_CHANNELS (16) -ALuint BytesFromDevFmt(enum DevFmtType type) DECL_CONST; -ALuint ChannelsFromDevFmt(enum DevFmtChannels chans) DECL_CONST; +ALuint BytesFromDevFmt(enum DevFmtType type); +ALuint ChannelsFromDevFmt(enum DevFmtChannels chans); inline ALuint FrameSizeFromDevFmt(enum DevFmtChannels chans, enum DevFmtType type) { return ChannelsFromDevFmt(chans) * BytesFromDevFmt(type); @@ -842,8 +840,8 @@ void SetRTPriority(void); void SetDefaultChannelOrder(ALCdevice *device); void SetDefaultWFXChannelOrder(ALCdevice *device); -const ALCchar *DevFmtTypeString(enum DevFmtType type) DECL_CONST; -const ALCchar *DevFmtChannelsString(enum DevFmtChannels chans) DECL_CONST; +const ALCchar *DevFmtTypeString(enum DevFmtType type); +const ALCchar *DevFmtChannelsString(enum DevFmtChannels chans); /** * GetChannelIdxByName diff --git a/OpenAL32/alBuffer.c b/OpenAL32/alBuffer.c index f9093cb7..193cfeaa 100644 --- a/OpenAL32/alBuffer.c +++ b/OpenAL32/alBuffer.c @@ -45,10 +45,10 @@ extern inline struct ALbuffer *RemoveBuffer(ALCdevice *device, ALuint id); extern inline ALuint FrameSizeFromUserFmt(enum UserFmtChannels chans, enum UserFmtType type); extern inline ALuint FrameSizeFromFmt(enum FmtChannels chans, enum FmtType type); -static ALboolean IsValidType(ALenum type) DECL_CONST; -static ALboolean IsValidChannels(ALenum channels) DECL_CONST; -static ALboolean DecomposeUserFormat(ALenum format, enum UserFmtChannels *chans, enum UserFmtType *type) DECL_CONST; -static ALboolean DecomposeFormat(ALenum format, enum FmtChannels *chans, enum FmtType *type) DECL_CONST; +static ALboolean IsValidType(ALenum type); +static ALboolean IsValidChannels(ALenum channels); +static ALboolean DecomposeUserFormat(ALenum format, enum UserFmtChannels *chans, enum UserFmtType *type); +static ALboolean DecomposeFormat(ALenum format, enum FmtChannels *chans, enum FmtType *type); static ALboolean SanitizeAlignment(enum UserFmtType type, ALsizei *align); |