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

[<sp...@us...>]

Revision: 3716
          http://fuse-emulator.svn.sourceforge.net/fuse-emulator/?rev=3716&view=rev
Author:   specu
Date:     2008-07-18 03:25:13 +0000 (Fri, 18 Jul 2008)

Log Message:
-----------
fix functions export for dll (Marek)

Modified Paths:
--------------
    trunk/libspectrum/hacking/ChangeLog
    trunk/libspectrum/libspectrum.h.in
    trunk/libspectrum/make-perl.c

Modified: trunk/libspectrum/hacking/ChangeLog
===================================================================
--- trunk/libspectrum/hacking/ChangeLog	2008-07-15 12:24:44 UTC (rev 3715)
+++ trunk/libspectrum/hacking/ChangeLog	2008-07-18 03:25:13 UTC (rev 3716)
@@ -670,3 +670,5 @@
          code anyway, which we faithfully checked through many levels of code.
          Stop doing this as it just makes the code less readable.
 20080701 memory.c: allow calloc function to be changed.
+20080717 make-perl.c,libspectrum.h.in: Win32: fix functions export for dll
+	 (Marek).

Modified: trunk/libspectrum/libspectrum.h.in
===================================================================
--- trunk/libspectrum/libspectrum.h.in	2008-07-15 12:24:44 UTC (rev 3715)
+++ trunk/libspectrum/libspectrum.h.in	2008-07-18 03:25:13 UTC (rev 3716)
@@ -132,12 +132,12 @@
   libspectrum_free_fn_t free;
 } libspectrum_mem_vtable_t;
 
-void* libspectrum_malloc( size_t size );
-void* libspectrum_calloc( size_t nmemb, size_t size );
-void* libspectrum_realloc( void *ptr, size_t size );
-void libspectrum_free( void *ptr );
+void* WIN32_DLL libspectrum_malloc( size_t size );
+void* WIN32_DLL libspectrum_calloc( size_t nmemb, size_t size );
+void* WIN32_DLL libspectrum_realloc( void *ptr, size_t size );
+void WIN32_DLL libspectrum_free( void *ptr );
 
-void libspectrum_mem_set_vtable( libspectrum_mem_vtable_t *table );
+void WIN32_DLL libspectrum_mem_set_vtable( libspectrum_mem_vtable_t *table );
 
 /* Attempt to identify a given file */
 

Modified: trunk/libspectrum/make-perl.c
===================================================================
--- trunk/libspectrum/make-perl.c	2008-07-15 12:24:44 UTC (rev 3715)
+++ trunk/libspectrum/make-perl.c	2008-07-18 03:25:13 UTC (rev 3716)
@@ -228,12 +228,12 @@
 "  size_t allocated;\n"
 "};\n"
 "\n"
-"GArray* g_array_new( gboolean zero_terminated, gboolean clear,\n"
+"GArray* WIN32_DLL g_array_new( gboolean zero_terminated, gboolean clear,\n"
 "		      guint element_size );\n"
 "#define g_array_append_val(a,v) g_array_append_vals( a, &(v), 1 );\n"
-"GArray* g_array_append_vals( GArray *array, gconstpointer data, guint len );\n"
+"GArray* WIN32_DLL g_array_append_vals( GArray *array, gconstpointer data, guint len );\n"
 "#define g_array_index(a,t,i) (*(((t*)a->data)+i))\n"
-"GArray* g_array_set_size( GArray *array, guint length );\n"
+"GArray* WIN32_DLL g_array_set_size( GArray *array, guint length );\n"
 "\n" );
   if( sizeof( void* ) == sizeof( int ) ) {
     printf( "#define GINT_TO_POINTER(i)      ((gpointer)  (i))\n" );


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