X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fmiscplay.c;h=723981da8ed15dc421a9fa8d338d5c635d43fb67;hb=2cbece6401b2279497293e6dc54cda607f49db2f;hp=37eeb171ce6268dc35afa05b6403e71f2a652001;hpb=d0199737b71a90969f6e7e77394cd0a65be6fdc4;p=chise%2Fxemacs-chise.git- diff --git a/src/miscplay.c b/src/miscplay.c index 37eeb17..723981d 100644 --- a/src/miscplay.c +++ b/src/miscplay.c @@ -32,7 +32,6 @@ #define UNUSED(x) ((void)(x)) #else #define UNUSED(x) -#define __inline__ #endif /* Maintain global variable for keeping parser state information; this struct @@ -114,7 +113,7 @@ static size_t parsevoc(void **data,size_t *sz,void **outbuf) this might require re-partioning of the data segments if headers cross the boundaries between two read operations. This is done in a two-step way: first we request a certain amount of bytes... */ -static __inline__ int waverequire(void **data,size_t *sz,size_t rq) +static inline int waverequire(void **data,size_t *sz,size_t rq) { int rc = 1; @@ -135,7 +134,7 @@ static __inline__ int waverequire(void **data,size_t *sz,size_t rq) } /* ...and next we remove this many bytes from the buffer */ -static __inline__ void waveremove(size_t rq) +static inline void waveremove(size_t rq) { if (parsestate.wave.left <= rq) parsestate.wave.left = 0; @@ -431,7 +430,7 @@ size_t sndcnv2unsigned(void **data,size_t *sz,void **outbuf) /* Convert a number in the range -32768..32767 to an 8 bit ulaw encoded number --- I hope, I got this conversion right :-) */ -static __inline__ signed char int2ulaw(int i) +static inline signed char int2ulaw(int i) { /* Lookup table for fast calculation of number of bits that need shifting*/ static short int t_bits[128] = { @@ -562,7 +561,6 @@ size_t sndcnvULaw_2mono(void **data,size_t *sz,void **outbuf) size_t sndcnv16swap(void **data,size_t *sz,void **outbuf) { - /* #### Not aliasing-safe!! Must convert to use unions instead! */ size_t cnt = *sz / 2; unsigned short *p;