[Vice-emu-commit] SF.net SVN: vice-emu: [18957] trunk/vice/src

Revision: 18957
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18957&view=rev
Author:   strik
Date:     2008-07-04 10:55:57 -0700 (Fri, 04 Jul 2008)

Log Message:
-----------
2008-07-04  Spiro Trikaliotis  <spi...@gm...>

	* src/c64/ramcart.c: Include vicii-phi1.h for vicii_read_phi1().

	* src/clipboard.c: Define for variable i as unsigned to prevent
	a warning.

	* src/arch/win32/base.dsp: Add clipboard.c so vice compiles
	again.

	* src/sound.h: changed SWORD sound_audio_mix(SWORD ch1, SWORD
	ch2); to SWORD sound_audio_mix(int ch1, int ch2).

Modified Paths:
--------------
    trunk/vice/src/ChangeLog
    trunk/vice/src/arch/win32/base.dsp
    trunk/vice/src/c64/ramcart.c
    trunk/vice/src/clipboard.c
    trunk/vice/src/sound.h

Modified: trunk/vice/src/ChangeLog
===================================================================
--- trunk/vice/src/ChangeLog	2008-07-04 17:22:07 UTC (rev 18956)
+++ trunk/vice/src/ChangeLog	2008-07-04 17:55:57 UTC (rev 18957)
@@ -4,6 +4,16 @@
 
 	* arch/win32/vice.dsw: Removed vice.dsp
 
+	* c64/ramcart.c: Include vicii-phi1.h for vicii_read_phi1().
+
+	* clipboard.c: Define for variable i as unsigned to prevent a
+	warning.
+
+	* arch/win32/base.dsp: Add clipboard.c so vice compiles again.
+
+	* sound.h: changed SWORD sound_audio_mix(SWORD ch1, SWORD ch2);
+	to SWORD sound_audio_mix(int ch1, int ch2).
+
 2008-07-04  Marco van den Heuvel  <bla...@ya...>
 
 	* Makefile.am, arch/win32/ui.c, clipboard.c, clipboard.h: Moved

Modified: trunk/vice/src/arch/win32/base.dsp
===================================================================
--- trunk/vice/src/arch/win32/base.dsp	2008-07-04 17:22:07 UTC (rev 18956)
+++ trunk/vice/src/arch/win32/base.dsp	2008-07-04 17:55:57 UTC (rev 18957)
@@ -140,6 +140,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE="..\..\clipboard.c"
+# End Source File
+# Begin Source File
+
 SOURCE="..\..\clkguard.c"
 # End Source File
 # Begin Source File

Modified: trunk/vice/src/c64/ramcart.c
===================================================================
--- trunk/vice/src/c64/ramcart.c	2008-07-04 17:22:07 UTC (rev 18956)
+++ trunk/vice/src/c64/ramcart.c	2008-07-04 17:55:57 UTC (rev 18957)
@@ -96,8 +96,8 @@
 #endif
 #include "types.h"
 #include "util.h"
+#include "vicii-phi1.h"
 
-
 static const c64export_resource_t export_res = {
     "RAMCART", 1, 0
 };

Modified: trunk/vice/src/clipboard.c
===================================================================
--- trunk/vice/src/clipboard.c	2008-07-04 17:22:07 UTC (rev 18956)
+++ trunk/vice/src/clipboard.c	2008-07-04 17:55:57 UTC (rev 18957)
@@ -45,8 +45,8 @@
         unsigned int row, col;
         unsigned int size;
         unsigned int line_ending_length = strlen(line_ending);
+        unsigned int i;
         int bank;
-        int i;
         char * p;
 
         mem_get_screen_parameter(&base, &allrows, &allcols, &bank);

Modified: trunk/vice/src/sound.h
===================================================================
--- trunk/vice/src/sound.h	2008-07-04 17:22:07 UTC (rev 18956)
+++ trunk/vice/src/sound.h	2008-07-04 17:55:57 UTC (rev 18957)
@@ -85,7 +85,7 @@
     int need_attenuation;
 } sound_device_t;
 
-static inline SWORD sound_audio_mix(SWORD ch1, SWORD ch2)
+static inline SWORD sound_audio_mix(int ch1, int ch2)
 {
   if (ch1 == 0)
     return ch2;


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