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

Revision: 18958
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18958&view=rev
Author:   strik
Date:     2008-07-04 11:58:23 -0700 (Fri, 04 Jul 2008)

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

	* arch/win32/Makefile.am: Removed vice.dsp

	* 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).

	* src/gfxoutputdrv/bmpdrv.c: bmpdrv_write_memmap() now is a void
	function.

	* src/screenshot.c: memmap_screenshot_save() had an unused
	variable i, removed that.

	* src/lib.c, src/lib.h: lib_free() now takes a const pointer.

	* src/arch/unix/archdep.c: viceuserdir is now a const pointer.

	* src/arch/unix/tfearch.c: Removed unused TfePcapCloseAdapter()
	function.

Modified Paths:
--------------
    trunk/vice/src/ChangeLog
    trunk/vice/src/arch/unix/archdep.c
    trunk/vice/src/arch/unix/tfearch.c
    trunk/vice/src/gfxoutputdrv/bmpdrv.c
    trunk/vice/src/lib.c
    trunk/vice/src/lib.h
    trunk/vice/src/screenshot.c

Modified: trunk/vice/src/ChangeLog
===================================================================
--- trunk/vice/src/ChangeLog	2008-07-04 17:55:57 UTC (rev 18957)
+++ trunk/vice/src/ChangeLog	2008-07-04 18:58:23 UTC (rev 18958)
@@ -14,6 +14,19 @@
 	* sound.h: changed SWORD sound_audio_mix(SWORD ch1, SWORD ch2);
 	to SWORD sound_audio_mix(int ch1, int ch2).
 
+	* gfxoutputdrv/bmpdrv.c: bmpdrv_write_memmap() now is a void
+	function.
+
+	* screenshot.c: memmap_screenshot_save() had an unused variable
+	i, removed that.
+
+	* lib.c, lib.h: lib_free() now takes a const pointer.
+
+	* arch/unix/archdep.c: viceuserdir is now a const pointer.
+
+	* arch/unix/tfearch.c: Removed unused TfePcapCloseAdapter()
+	function.
+
 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/unix/archdep.c
===================================================================
--- trunk/vice/src/arch/unix/archdep.c	2008-07-04 17:55:57 UTC (rev 18957)
+++ trunk/vice/src/arch/unix/archdep.c	2008-07-04 18:58:23 UTC (rev 18958)
@@ -260,7 +260,7 @@
 { 
     char *fname;
     const char *home;
-    char *viceuserdir;
+    const char *viceuserdir;
 
     if(archdep_pref_path==NULL) {
       home = archdep_home_path();

Modified: trunk/vice/src/arch/unix/tfearch.c
===================================================================
--- trunk/vice/src/arch/unix/tfearch.c	2008-07-04 17:55:57 UTC (rev 18957)
+++ trunk/vice/src/arch/unix/tfearch.c	2008-07-04 18:58:23 UTC (rev 18958)
@@ -96,6 +96,7 @@
 #endif // #ifdef TFE_DEBUG_PKTDUMP
 
 
+#if 0
 static
 void TfePcapCloseAdapter(void) 
 {
@@ -109,6 +110,7 @@
         TfePcapFP = NULL;
     }
 }
+#endif
 
 /*
  These functions let the UI enumerate the available interfaces.

Modified: trunk/vice/src/gfxoutputdrv/bmpdrv.c
===================================================================
--- trunk/vice/src/gfxoutputdrv/bmpdrv.c	2008-07-04 17:55:57 UTC (rev 18957)
+++ trunk/vice/src/gfxoutputdrv/bmpdrv.c	2008-07-04 18:58:23 UTC (rev 18958)
@@ -472,7 +472,7 @@
     return 0;
 }
 
-static int bmpdrv_write_memmap(int line, int x_size, int y_size, BYTE *gfx)
+static void bmpdrv_write_memmap(int line, int x_size, int y_size, BYTE *gfx)
 {
     memcpy(bmpdrv_memmap_bmp_data + (y_size - 1 - line) * x_size, gfx+(line*x_size), x_size);
 }

Modified: trunk/vice/src/lib.c
===================================================================
--- trunk/vice/src/lib.c	2008-07-04 17:55:57 UTC (rev 18957)
+++ trunk/vice/src/lib.c	2008-07-04 18:58:23 UTC (rev 18958)
@@ -490,8 +490,9 @@
     return new_ptr;
 }
 
-void lib_free(void *ptr)
+void lib_free(const void *constptr)
 {
+    void * ptr = (void*) constptr;
 #ifdef LIB_DEBUG
     lib_debug_free(ptr, 1, 1);
 #endif

Modified: trunk/vice/src/lib.h
===================================================================
--- trunk/vice/src/lib.h	2008-07-04 17:55:57 UTC (rev 18957)
+++ trunk/vice/src/lib.h	2008-07-04 18:58:23 UTC (rev 18958)
@@ -38,7 +38,7 @@
 extern void *lib_malloc(size_t size);
 extern void *lib_calloc(size_t nmemb, size_t size);
 extern void *lib_realloc(void *p, size_t size);
-extern void lib_free(void *ptr);
+extern void lib_free(const void *ptr);
 
 extern char *lib_stralloc(const char *str);
 extern char *lib_msprintf(const char *fmt, ...);

Modified: trunk/vice/src/screenshot.c
===================================================================
--- trunk/vice/src/screenshot.c	2008-07-04 17:55:57 UTC (rev 18957)
+++ trunk/vice/src/screenshot.c	2008-07-04 18:58:23 UTC (rev 18958)
@@ -194,7 +194,6 @@
 int memmap_screenshot_save(const char *drvname, const char *filename, int x_size, int y_size, BYTE *gfx, BYTE *palette)
 {
     gfxoutputdrv_t *drv;
-    unsigned int i;
 
     if ((drv = gfxoutput_get_driver(drvname)) == NULL)
         return -1;


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