$OpenBSD: patch-src_libaudcore_audio_c,v 1.3 2012/05/11 10:53:54 dcoppa Exp $
--- src/libaudcore/audio.c.orig	Sat Mar 31 19:45:52 2012
+++ src/libaudcore/audio.c	Fri May 11 12:30:32 2012
@@ -64,22 +64,22 @@ TO_INT_LOOP (to_u24, int32_t, noop32, 0x800000, 0x7fff
 TO_INT_LOOP (to_s32, int32_t, noop32, 0x00000000, 0x7fffffff)
 TO_INT_LOOP (to_u32, int32_t, noop32, 0x80000000, 0x7fffffff)
 
-static inline int16_t swap16 (int16_t i) {return GUINT16_SWAP_LE_BE (i);}
-static inline int32_t swap32 (int32_t i) {return GUINT32_SWAP_LE_BE (i);}
+static inline int16_t Aswap16 (int16_t i) {return GUINT16_SWAP_LE_BE (i);}
+static inline int32_t Aswap32 (int32_t i) {return GUINT32_SWAP_LE_BE (i);}
 
-FROM_INT_LOOP (from_s16_swap, int16_t, swap16, 0x0000, 0x7fff)
-FROM_INT_LOOP (from_u16_swap, int16_t, swap16, 0x8000, 0x7fff)
-FROM_INT_LOOP (from_s24_swap, int32_t, swap32, 0x000000, 0x7fffff)
-FROM_INT_LOOP (from_u24_swap, int32_t, swap32, 0x800000, 0x7fffff)
-FROM_INT_LOOP (from_s32_swap, int32_t, swap32, 0x00000000, 0x7fffffff)
-FROM_INT_LOOP (from_u32_swap, int32_t, swap32, 0x80000000, 0x7fffffff)
+FROM_INT_LOOP (from_s16_swap, int16_t, Aswap16, 0x0000, 0x7fff)
+FROM_INT_LOOP (from_u16_swap, int16_t, Aswap16, 0x8000, 0x7fff)
+FROM_INT_LOOP (from_s24_swap, int32_t, Aswap32, 0x000000, 0x7fffff)
+FROM_INT_LOOP (from_u24_swap, int32_t, Aswap32, 0x800000, 0x7fffff)
+FROM_INT_LOOP (from_s32_swap, int32_t, Aswap32, 0x00000000, 0x7fffffff)
+FROM_INT_LOOP (from_u32_swap, int32_t, Aswap32, 0x80000000, 0x7fffffff)
 
-TO_INT_LOOP (to_s16_swap, int16_t, swap16, 0x0000, 0x7fff)
-TO_INT_LOOP (to_u16_swap, int16_t, swap16, 0x8000, 0x7fff)
-TO_INT_LOOP (to_s24_swap, int32_t, swap32, 0x000000, 0x7fffff)
-TO_INT_LOOP (to_u24_swap, int32_t, swap32, 0x800000, 0x7fffff)
-TO_INT_LOOP (to_s32_swap, int32_t, swap32, 0x00000000, 0x7fffffff)
-TO_INT_LOOP (to_u32_swap, int32_t, swap32, 0x80000000, 0x7fffffff)
+TO_INT_LOOP (to_s16_swap, int16_t, Aswap16, 0x0000, 0x7fff)
+TO_INT_LOOP (to_u16_swap, int16_t, Aswap16, 0x8000, 0x7fff)
+TO_INT_LOOP (to_s24_swap, int32_t, Aswap32, 0x000000, 0x7fffff)
+TO_INT_LOOP (to_u24_swap, int32_t, Aswap32, 0x800000, 0x7fffff)
+TO_INT_LOOP (to_s32_swap, int32_t, Aswap32, 0x00000000, 0x7fffffff)
+TO_INT_LOOP (to_u32_swap, int32_t, Aswap32, 0x80000000, 0x7fffffff)
 
 typedef void (* FromFunc) (const void * in, float * out, int samples);
 typedef void (* ToFunc) (const float * in, void * out, int samples);
