[Vice-emu-commit] SF.net SVN: vice-emu: [18804] branches/marco/ports/vice/src

Revision: 18804
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18804&view=rev
Author:   blackystardust
Date:     2008-05-24 15:46:57 -0700 (Sat, 24 May 2008)

Log Message:
-----------
Fixed some unix warnings/issues

Modified Paths:
--------------
    branches/marco/ports/vice/src/arch/unix/joy.h
    branches/marco/ports/vice/src/arch/unix/x11/gnome/uicolor.c
    branches/marco/ports/vice/src/arch/unix/x11/gnome/uipalcontrol.c
    branches/marco/ports/vice/src/arch/unix/x11/xaw/widgets/FileSel.c
    branches/marco/ports/vice/src/sounddrv/soundarts.c

Modified: branches/marco/ports/vice/src/arch/unix/joy.h
===================================================================
--- branches/marco/ports/vice/src/arch/unix/joy.h	2008-05-24 16:56:05 UTC (rev 18803)
+++ branches/marco/ports/vice/src/arch/unix/joy.h	2008-05-24 22:46:57 UTC (rev 18804)
@@ -48,6 +48,12 @@
 
 extern int joystick_port_map[2];
 
+#ifdef HAS_USB_JOYSTICK
+extern int usb_joystick_init(void);
+extern void usb_joystick_close(void);
+extern void usb_joystick(void);
+#endif
+
 #define JOYDEV_NONE         0
 #define JOYDEV_NUMPAD       1
 #define JOYDEV_KEYSET1      2

Modified: branches/marco/ports/vice/src/arch/unix/x11/gnome/uicolor.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/x11/gnome/uicolor.c	2008-05-24 16:56:05 UTC (rev 18803)
+++ branches/marco/ports/vice/src/arch/unix/x11/gnome/uicolor.c	2008-05-24 22:46:57 UTC (rev 18804)
@@ -95,7 +95,7 @@
 
 int uicolor_set_palette(struct video_canvas_s *c, const palette_t *palette)
 {
-    int i;
+    unsigned int i;
 
     uicolor_init_video_colors();
 

Modified: branches/marco/ports/vice/src/arch/unix/x11/gnome/uipalcontrol.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/x11/gnome/uipalcontrol.c	2008-05-24 16:56:05 UTC (rev 18803)
+++ branches/marco/ports/vice/src/arch/unix/x11/gnome/uipalcontrol.c	2008-05-24 22:46:57 UTC (rev 18804)
@@ -68,7 +68,8 @@
 
 static void pal_ctrl_reset (GtkWidget *w, gpointer data)
 {
-    int i, tmp;
+    unsigned int i
+    int tmp;
 
     for (i = 0; i < sizeof(ctrls)/sizeof(ctrls[0]); i++)
     {
@@ -121,7 +122,8 @@
     GtkWidget *box;
     
     GtkWidget *rb;
-    int i, v;
+    unsigned int i;
+    int v;
 
     cached_canvas = canvas;
     f = gtk_frame_new(_("PAL Settings"));

Modified: branches/marco/ports/vice/src/arch/unix/x11/xaw/widgets/FileSel.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/x11/xaw/widgets/FileSel.c	2008-05-24 16:56:05 UTC (rev 18803)
+++ branches/marco/ports/vice/src/arch/unix/x11/xaw/widgets/FileSel.c	2008-05-24 22:46:57 UTC (rev 18804)
@@ -1234,7 +1234,9 @@
 	Widget cur_dir_text;
 	Arg args[10];
 	String path;
+#if defined VICE && (defined HAVE_REGEXP_H || defined HAVE_REGEX_H)
 	char *fpath, *fpattern;
+#endif
 
 	/* what is this actually needed for? */
 	XtSetArg(args[0],XtNstring,(XtArgVal)(&path));

Modified: branches/marco/ports/vice/src/sounddrv/soundarts.c
===================================================================
--- branches/marco/ports/vice/src/sounddrv/soundarts.c	2008-05-24 16:56:05 UTC (rev 18803)
+++ branches/marco/ports/vice/src/sounddrv/soundarts.c	2008-05-24 22:46:57 UTC (rev 18804)
@@ -57,7 +57,6 @@
 static int artsdrv_fragsize;
 static int artsdrv_fragnr;
 static double artsdrv_bufsize;
-static int artsdrv_lastbs=0;
 static int artsdrv_suspended=0;
 /*
  * static int artsdrv_bs=0;
@@ -135,6 +134,7 @@
 }
 
 
+#if 0
 /*
 ** As the aRts C API doesn't support a DSP_SNDCTL_POST equivalent
 ** function, i tried to emulate but apparently its not needed so
@@ -152,6 +152,7 @@
     return 0;
 
 };
+#endif
 
 int artsdrv_resume(void)
 {
@@ -172,8 +173,8 @@
     NULL,
     artsdrv_bufferspace,
     artsdrv_close,
-    NULL,//artsdrv_suspend,
-    NULL,//artsdrv_resume
+    NULL,  /* artsdrv_suspend */
+    NULL, /* artsdrv_resume */
     1
 };
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.