From dca6186c6aa93bda74bff6b90a5c0438008b0e94 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@lokigames.com>
Date: Wed, 2 Feb 2000 00:19:18 +0000
Subject: [PATCH] Various fixes from Markus Oberhumer

---
 Makefile.am           | 3 +--
 mikmod/mikmod_build.h | 4 ++++
 mikmod/mplayer.c      | 2 +-
 music.c               | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index b435d6bf..a1c33f3d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,8 +2,6 @@
 
 lib_LTLIBRARIES = libSDL_mixer.la
 
-EXTRA_DIST = CHANGES VisualC.zip
-
 SUBDIRS = @MUSIC_SUBDIRS@
 DIST_SUBIDRS = mikmod timidity
 
@@ -33,6 +31,7 @@ endif
 
 EXTRA_DIST =			\
 	CHANGES			\
+	VisualC.zip		\
 	autogen.sh
 
 libSDL_mixer_la_LDFLAGS = 		\
diff --git a/mikmod/mikmod_build.h b/mikmod/mikmod_build.h
index b3fc50ec..29fe3b44 100644
--- a/mikmod/mikmod_build.h
+++ b/mikmod/mikmod_build.h
@@ -3,3 +3,7 @@
 #if defined(WIN32) && !defined(__STDC__)
 #  define __STDC__ 1
 #endif
+
+#if defined(WIN32) && defined(_MSC_VER)
+#  pragma warning(disable: 4018 4244)
+#endif
diff --git a/mikmod/mplayer.c b/mikmod/mplayer.c
index 1f647ac1..f0a4bf10 100644
--- a/mikmod/mplayer.c
+++ b/mikmod/mplayer.c
@@ -232,7 +232,7 @@ static int getrandom(int ceil)
 #ifdef HAVE_SRANDOM
 	return random()&(ceil-1);
 #else
-	return (int)(rand()*ceil)/(RAND_MAX+1.0);
+	return (int)((rand()*ceil)/(RAND_MAX+1.0));
 #endif
 }
 
diff --git a/music.c b/music.c
index 7d0d3866..01c71f05 100644
--- a/music.c
+++ b/music.c
@@ -319,7 +319,7 @@ int open_music(SDL_AudioSpec *mixer)
 	Mix_VolumeMusic(SDL_MIX_MAXVOLUME);
 
 	/* Calculate the number of ms for each callback */
-	ms_per_step = (int)((float)mixer->samples * 1000.0) / mixer->freq;
+	ms_per_step = (int) (((float)mixer->samples * 1000.0) / mixer->freq);
 
 	return(0);
 }