1.1 --- a/src/drivers/audio_alsa.c	Thu Aug 07 23:53:17 2008 +0000
     1.2 +++ b/src/drivers/audio_alsa.c	Fri Aug 08 00:17:57 2008 +0000
     1.3 @@ -44,7 +44,7 @@
     1.4      snd_pcm_sw_params_t *sw_params;
     1.5      snd_pcm_uframes_t frames;
     1.6      snd_pcm_uframes_t bufferSize;
     1.7 -    int rate = DEFAULT_SAMPLE_RATE;
     1.8 +    unsigned int rate = DEFAULT_SAMPLE_RATE;
     1.9      int format = DEFAULT_SAMPLE_FORMAT;
    1.10      int dir;
    1.11  

     2.1 --- a/src/drivers/cd_linux.c	Thu Aug 07 23:53:17 2008 +0000
     2.2 +++ b/src/drivers/cd_linux.c	Fri Aug 08 00:17:57 2008 +0000
     2.3 @@ -20,6 +20,7 @@
     2.4  #include <stdio.h>
     2.5  #include <string.h>
     2.6  #include <errno.h>
     2.7 +#include <ctype.h>
     2.8  #include <linux/cdrom.h>
     2.9  #include <sys/stat.h>
    2.10  #include <sys/ioctl.h>
    2.11 @@ -50,7 +51,7 @@
    2.12  static gboolean linux_image_is_valid( FILE *f );
    2.13  static gdrom_disc_t linux_open_device( const gchar *filename, FILE *f );
    2.14  static gdrom_error_t linux_read_disc_toc( gdrom_image_t disc );
    2.15 -static gdrom_error_t linux_identify_drive( int fd, unsigned char *buf, int buflen );
    2.16 +static gdrom_error_t linux_identify_drive( int fd, char *buf, int buflen );
    2.17  static gdrom_error_t linux_read_sector( gdrom_disc_t disc, uint32_t sector,
    2.18                                          int mode, unsigned char *buf, uint32_t *length );
    2.19  static gdrom_error_t linux_send_command( int fd, char *cmd, unsigned char *buffer, uint32_t *buflen,
    2.20 @@ -204,16 +205,16 @@
    2.21      return linux_send_command( fd, cmd, NULL, &buflen, CGC_DATA_NONE );
    2.22  }
    2.23  
    2.24 -static unsigned char *trim( unsigned char *src )
    2.25 +static char *trim( char *src )
    2.26  {
    2.27 -    unsigned char *p = src + strlen(src)-1;
    2.28 +    char *p = src + strlen(src)-1;
    2.29      while( isspace(*src) ) 
    2.30          src++;
    2.31      while( p >= src && isspace(*p) )
    2.32          *p-- = '\0';
    2.33      return src;
    2.34  }
    2.35 -static gdrom_error_t linux_identify_drive( int fd, unsigned char *buf, int buflen )
    2.36 +static gdrom_error_t linux_identify_drive( int fd, char *buf, int buflen )
    2.37  {
    2.38      unsigned char ident[256];
    2.39      uint32_t identlen = 256;

     3.1 --- a/src/drivers/video_glx.c	Thu Aug 07 23:53:17 2008 +0000
     3.2 +++ b/src/drivers/video_glx.c	Fri Aug 08 00:17:57 2008 +0000
     3.3 @@ -16,11 +16,11 @@
     3.4   * GNU General Public License for more details.
     3.5   */
     3.6  
     3.7 +#include <stdlib.h>
     3.8  #include <string.h>
     3.9  #include "display.h"
    3.10  #include <X11/Xlib.h>
    3.11  #include <GL/glx.h>
    3.12 -#include <string.h>
    3.13  #include "pvr2/pvr2.h"
    3.14  #include "pvr2/glutil.h"
    3.15  #include "drivers/video_glx.h"