Various fixes from Markus Oberhumer
authorSam Lantinga <slouken@lokigames.com>
Wed, 02 Feb 2000 00:19:18 +0000
changeset 44deefeb93dda7
parent 43 2ada52ee12e7
child 45 10b1303d2561
Various fixes from Markus Oberhumer
Makefile.am
mikmod/mikmod_build.h
mikmod/mplayer.c
music.c
     1.1 --- a/Makefile.am	Tue Feb 01 21:27:06 2000 +0000
     1.2 +++ b/Makefile.am	Wed Feb 02 00:19:18 2000 +0000
     1.3 @@ -2,8 +2,6 @@
     1.4  
     1.5  lib_LTLIBRARIES = libSDL_mixer.la
     1.6  
     1.7 -EXTRA_DIST = CHANGES VisualC.zip
     1.8 -
     1.9  SUBDIRS = @MUSIC_SUBDIRS@
    1.10  DIST_SUBIDRS = mikmod timidity
    1.11  
    1.12 @@ -33,6 +31,7 @@
    1.13  
    1.14  EXTRA_DIST =			\
    1.15  	CHANGES			\
    1.16 +	VisualC.zip		\
    1.17  	autogen.sh
    1.18  
    1.19  libSDL_mixer_la_LDFLAGS = 		\
     2.1 --- a/mikmod/mikmod_build.h	Tue Feb 01 21:27:06 2000 +0000
     2.2 +++ b/mikmod/mikmod_build.h	Wed Feb 02 00:19:18 2000 +0000
     2.3 @@ -3,3 +3,7 @@
     2.4  #if defined(WIN32) && !defined(__STDC__)
     2.5  #  define __STDC__ 1
     2.6  #endif
     2.7 +
     2.8 +#if defined(WIN32) && defined(_MSC_VER)
     2.9 +#  pragma warning(disable: 4018 4244)
    2.10 +#endif
     3.1 --- a/mikmod/mplayer.c	Tue Feb 01 21:27:06 2000 +0000
     3.2 +++ b/mikmod/mplayer.c	Wed Feb 02 00:19:18 2000 +0000
     3.3 @@ -232,7 +232,7 @@
     3.4  #ifdef HAVE_SRANDOM
     3.5  	return random()&(ceil-1);
     3.6  #else
     3.7 -	return (int)(rand()*ceil)/(RAND_MAX+1.0);
     3.8 +	return (int)((rand()*ceil)/(RAND_MAX+1.0));
     3.9  #endif
    3.10  }
    3.11  
     4.1 --- a/music.c	Tue Feb 01 21:27:06 2000 +0000
     4.2 +++ b/music.c	Wed Feb 02 00:19:18 2000 +0000
     4.3 @@ -319,7 +319,7 @@
     4.4  	Mix_VolumeMusic(SDL_MIX_MAXVOLUME);
     4.5  
     4.6  	/* Calculate the number of ms for each callback */
     4.7 -	ms_per_step = (int)((float)mixer->samples * 1000.0) / mixer->freq;
     4.8 +	ms_per_step = (int) (((float)mixer->samples * 1000.0) / mixer->freq);
     4.9  
    4.10  	return(0);
    4.11  }