From 68968734f8f821667fd8d49430e7bb85489a8e6f Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@libsdl.org>
Date: Tue, 11 Sep 2001 19:33:01 +0000
Subject: [PATCH] Minor cleanups

---
 acinclude.m4           |  1 +
 effect_position.c      | 18 ++++++++----------
 effect_stereoreverse.c |  3 +--
 load_aiff.c            |  4 +---
 load_voc.c             |  6 +++---
 5 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index b5bd8c8e..4b8eb82c 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -32,6 +32,7 @@ AC_ARG_ENABLE(sdltest, [  --disable-sdltest       Do not try to compile and run
      fi
   fi
 
+  AC_REQUIRE([AC_CANONICAL_TARGET])
   AC_PATH_PROG(SDL_CONFIG, sdl-config, no)
   min_sdl_version=ifelse([$1], ,0.11.0,$1)
   AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
diff --git a/effect_position.c b/effect_position.c
index c7f6bb7e..792b22af 100644
--- a/effect_position.c
+++ b/effect_position.c
@@ -26,8 +26,8 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/time.h>
-#include <unistd.h>
+#include <string.h>
+
 #include "SDL.h"
 #include "SDL_mixer.h"
 
@@ -438,8 +438,8 @@ int Mix_SetPanning(int channel, Uint8 left, Uint8 right)
 
     args->left_u8 = left;
     args->right_u8 = right;
-    args->left_f = ((float) left) / 255.0;
-    args->right_f = ((float) right) / 255.0;
+    args->left_f = ((float) left) / 255.0f;
+    args->right_f = ((float) right) / 255.0f;
     if (!args->in_use) {
         args->in_use = 1;
         return(Mix_RegisterEffect(channel, f, _Eff_PositionDone, (void *) args));
@@ -474,7 +474,7 @@ int Mix_SetDistance(int channel, Uint8 distance)
     }
 
     args->distance_u8 = distance;
-    args->distance_f = ((float) distance) / 255.0;
+    args->distance_f = ((float) distance) / 255.0f;
     if (!args->in_use) {
         args->in_use = 1;
         return(Mix_RegisterEffect(channel, f, _Eff_PositionDone, (void *) args));
@@ -491,8 +491,6 @@ int Mix_SetPosition(int channel, Sint16 angle, Uint8 distance)
     int channels;
     position_args *args = NULL;
     Uint8 left = 255, right = 255;
-    int flip;
-    float angle_f;
 
     Mix_QuerySpec(NULL, &format, &channels);
     f = get_position_effect_func(format);
@@ -537,11 +535,11 @@ int Mix_SetPosition(int channel, Sint16 angle, Uint8 distance)
     distance = 255 - distance;  /* flip it to scale Mix_SetDistance() uses. */
 
     args->left_u8 = left;
-    args->left_f = ((float) left) / 255.0;
+    args->left_f = ((float) left) / 255.0f;
     args->right_u8 = right;
-    args->right_f = ((float) right) / 255.0;
+    args->right_f = ((float) right) / 255.0f;
     args->distance_u8 = distance;
-    args->distance_f = ((float) distance) / 255.0;
+    args->distance_f = ((float) distance) / 255.0f;
     if (!args->in_use) {
         args->in_use = 1;
         return(Mix_RegisterEffect(channel, f, _Eff_PositionDone, (void *) args));
diff --git a/effect_stereoreverse.c b/effect_stereoreverse.c
index 65f09b6a..2fa6216b 100644
--- a/effect_stereoreverse.c
+++ b/effect_stereoreverse.c
@@ -26,8 +26,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/time.h>
-#include <unistd.h>
+
 #include "SDL.h"
 #include "SDL_mixer.h"
 
diff --git a/load_aiff.c b/load_aiff.c
index 26d20d24..700c6d90 100644
--- a/load_aiff.c
+++ b/load_aiff.c
@@ -24,9 +24,7 @@
     This file by Torbjörn Andersson (torbjorn.andersson@eurotime.se)
 */
 
-#include "SDL_mutex.h"
-#include "SDL_endian.h"
-#include "SDL_timer.h"
+#include <string.h>
 
 #include "SDL_mixer.h"
 #include "load_aiff.h"
diff --git a/load_voc.c b/load_voc.c
index acfbb983..457cab4b 100644
--- a/load_voc.c
+++ b/load_voc.c
@@ -88,7 +88,7 @@ typedef struct vocstuff {
 #define VOC_DATA_16	9
 
 
-static inline int voc_check_header(SDL_RWops *src)
+static int voc_check_header(SDL_RWops *src)
 {
     /* VOC magic header */
     Uint8  signature[20];  /* "Creative Voice File\032" */
@@ -127,7 +127,7 @@ static int voc_get_block(SDL_RWops *src, vs_t *v, SDL_AudioSpec *spec)
     Uint32 new_rate_long;
     Uint8 trash[6];
     Uint16 period;
-    int i;
+    unsigned int i;
 
     v->silent = 0;
     while (v->rest == 0)
@@ -167,7 +167,7 @@ static int voc_get_block(SDL_RWops *src, vs_t *v, SDL_AudioSpec *spec)
                     }
 
                     v->rate = uc;
-                    spec->freq = 1000000.0/(256 - v->rate);
+                    spec->freq = (Uint16)(1000000.0/(256 - v->rate));
                     v->channels = 1;
                 }