Changes since SDL 1.2.0 release

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402

src/audio/SDL_audiomem.c

@@ -29,13 +29,12 @@ static char rcsid =
 	(necessary because SDL audio emulates threads with fork()
  */
 
+#include <stdlib.h>
 #ifdef FORK_HACK
 #include <sys/types.h>
 #include <sys/ipc.h>
 #include <sys/shm.h>
 #include <stddef.h>
-#else
-#include <stdlib.h>
 #endif
 
 #include "SDL_audiomem.h"

src/audio/SDL_mixer.c

@@ -96,7 +96,7 @@ static const Uint8 mix8[] =
 #define ADJUST_VOLUME(s, v)	(s = (s*v)/SDL_MIX_MAXVOLUME)
 #define ADJUST_VOLUME_U8(s, v)	(s = (((s-128)*v)/SDL_MIX_MAXVOLUME)+128)
 
-void SDL_MixAudio (Uint8 *dst, Uint8 *src, Uint32 len, int volume)
+void SDL_MixAudio (Uint8 *dst, const Uint8 *src, Uint32 len, int volume)
 {
 	Uint16 format;
 

src/audio/dma/SDL_dmaaudio.c

@@ -48,6 +48,9 @@ static char rcsid =
 #ifdef __FreeBSD__
 #include <machine/soundcard.h>
 #endif
+#ifdef __OpenBSD__
+#include <soundcard.h>
+#endif
 #ifdef __USLC__
 #include <sys/soundcard.h>
 #endif

src/audio/dsp/SDL_dspaudio.c

@@ -46,6 +46,9 @@ static char rcsid =
 #ifdef __FreeBSD__
 #include <machine/soundcard.h>
 #endif
+#ifdef __OpenBSD__
+#include <soundcard.h>
+#endif
 #ifdef __USLC__
 #include <sys/soundcard.h>
 #endif