[fuse-emulator-cvs] SF.net SVN: fuse-emulator:[5437] trunk/libspectrum

[<sba...@us...>]

Revision: 5437
          http://sourceforge.net/p/fuse-emulator/code/5437
Author:   sbaldovi
Date:     2016-05-01 16:22:24 +0000 (Sun, 01 May 2016)
Log Message:
-----------
Don't use g_mem_set_vtable on newer GLib and distribute missing macro files.

Modified Paths:
--------------
    trunk/libspectrum/Makefile.am
    trunk/libspectrum/hacking/ChangeLog
    trunk/libspectrum/memory.c

Modified: trunk/libspectrum/Makefile.am
===================================================================
--- trunk/libspectrum/Makefile.am	2016-05-01 07:02:05 UTC (rev 5436)
+++ trunk/libspectrum/Makefile.am	2016-05-01 16:22:24 UTC (rev 5437)
@@ -107,6 +107,7 @@
 	     dll.c \
 	     generate.pl.in \
 	     m4/audiofile.m4 \
+	     m4/ax_create_stdint_h.m4 \
 	     m4/pkg.m4 \
 	     make-perl.c \
 	     tape_accessors.pl \

Modified: trunk/libspectrum/hacking/ChangeLog
===================================================================
--- trunk/libspectrum/hacking/ChangeLog	2016-05-01 07:02:05 UTC (rev 5436)
+++ trunk/libspectrum/hacking/ChangeLog	2016-05-01 16:22:24 UTC (rev 5437)
@@ -1043,3 +1043,5 @@
          warajevo_read.c,wav.c,z80.c,z80em.c,zlib.c,zxs.c: have a go at updating
          copyright dates since v 1.1.1 (Fred).
 20160430 README,doc/libspectrum.3: list more disk formats (Sergio).
+20160501 Makefile.am,memory.c: don't use g_mem_set_vtable on newer GLib and
+         distribute missing macro files (Sergio).

Modified: trunk/libspectrum/memory.c
===================================================================
--- trunk/libspectrum/memory.c	2016-05-01 07:02:05 UTC (rev 5436)
+++ trunk/libspectrum/memory.c	2016-05-01 16:22:24 UTC (rev 5437)
@@ -115,6 +115,7 @@
   libspectrum_free_fn = table->free;
 
 #ifdef HAVE_LIB_GLIB
+#if !GLIB_CHECK_VERSION( 2, 44, 0 )
   {
     GMemVTable glib_table;
 
@@ -124,5 +125,6 @@
 
     g_mem_set_vtable( &glib_table );
   }
+#endif                  /* #if !GLIB_CHECK_VERSION( 2, 44, 0 ) */
 #endif                  /* #ifdef HAVE_LIB_GLIB */
 }

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