fuse-emulator-cvs — SCM commits for Fuse (the Free Unix Spectrum Emulator), the associated utilities and libspectrum, the ZX Spectrum file format handling library

[fuse-emulator-cvs] [fuse] 03/04: Include some prototypes of global functions

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

This is an automated email from the git hooks/post-receive-user script.

sbaldovi pushed a commit to branch master
in repository fuse.

View the commit online:
https://sourceforge.net/p/fuse-emulator/fuse/ci/db5c27ddacdfc44ed753deb24c328841fa99f07e/

commit db5c27ddacdfc44ed753deb24c328841fa99f07e
Author: Sergio Baldoví <ser...@gm...>
AuthorDate: Sun Mar 14 20:17:49 2021 +0100

    Include some prototypes of global functions
---
 menu_data.pl            | 1 +
 ui/win32/about.c        | 1 +
 ui/win32/binary.c       | 1 +
 ui/win32/browse.c       | 1 +
 ui/win32/fileselector.c | 1 +
 ui/win32/options.pl     | 1 +
 ui/win32/roms.c         | 1 +
 7 files changed, 7 insertions(+)

diff --git a/menu_data.pl b/menu_data.pl
index b859c4f9..f73b36ef 100755
--- a/menu_data.pl
+++ b/menu_data.pl
@@ -340,6 +340,7 @@ sub dump_win32 ($$) {
     if( $mode eq 'c' ) {
 	print << "CODE";
 #include "ui/win32/menu_data.h"
+#include "ui/win32/win32internals.h"
 
 int handle_menu( DWORD cmd, HWND window )
 {
diff --git a/ui/win32/about.c b/ui/win32/about.c
index cfbf8174..f14d84e4 100644
--- a/ui/win32/about.c
+++ b/ui/win32/about.c
@@ -28,6 +28,7 @@
 
 #include "fuse.h"
 #include "hyperlinks.h"
+#include "menu.h"
 #include "win32internals.h"
 
 #include "about.h"
diff --git a/ui/win32/binary.c b/ui/win32/binary.c
index 1b4296a7..9e83163b 100644
--- a/ui/win32/binary.c
+++ b/ui/win32/binary.c
@@ -28,6 +28,7 @@
 #include <windows.h>
 
 #include "fuse.h"
+#include "menu.h"
 #include "ui/ui.h"
 #include "utils.h"
 #include "win32internals.h"
diff --git a/ui/win32/browse.c b/ui/win32/browse.c
index 80ded5e4..b381bf19 100644
--- a/ui/win32/browse.c
+++ b/ui/win32/browse.c
@@ -29,6 +29,7 @@
 #include <windows.h>
 
 #include "fuse.h"
+#include "menu.h"
 #include "tape.h"
 #include "ui/ui.h"
 #include "win32internals.h"
diff --git a/ui/win32/fileselector.c b/ui/win32/fileselector.c
index db8469fb..6447d532 100644
--- a/ui/win32/fileselector.c
+++ b/ui/win32/fileselector.c
@@ -26,6 +26,7 @@
 
 #include <windows.h>
 
+#include "ui/ui.h"
 #include "utils.h"
 #include "win32internals.h"
 
diff --git a/ui/win32/options.pl b/ui/win32/options.pl
index 22ed9349..270d9521 100755
--- a/ui/win32/options.pl
+++ b/ui/win32/options.pl
@@ -47,6 +47,7 @@ print Fuse::GPL( 'options.c: options dialog boxes',
 
 #include "display.h"
 #include "fuse.h"
+#include "menu.h"
 #include "options.h"
 #include "options_internals.h"
 #include "periph.h"
diff --git a/ui/win32/roms.c b/ui/win32/roms.c
index 81e0b2cf..08efea15 100644
--- a/ui/win32/roms.c
+++ b/ui/win32/roms.c
@@ -28,6 +28,7 @@
 #include <windows.h>
 
 #include "fuse.h"
+#include "menu.h"
 #include "roms.h"
 #include "settings.h"
 #include "ui/ui.h"

[fuse-emulator-cvs] [fuse] 01/04: Add missing 'void' in K&R-style parameter lists

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

This is an automated email from the git hooks/post-receive-user script.

sbaldovi pushed a commit to branch master
in repository fuse.

View the commit online:
https://sourceforge.net/p/fuse-emulator/fuse/ci/fcd74aff3e98d340b5230af4d1ea4db7353e218c/

commit fcd74aff3e98d340b5230af4d1ea4db7353e218c
Author: Sergio Baldoví <ser...@gm...>
AuthorDate: Sun Mar 14 00:04:33 2021 +0100

    Add missing 'void' in K&R-style parameter lists
---
 fuse.c             | 2 +-
 ui/widget/binary.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/fuse.c b/fuse.c
index 51ebf575..e126b6c4 100644
--- a/fuse.c
+++ b/fuse.c
@@ -274,7 +274,7 @@ setuid_init( void *context )
 }
 
 static void
-setuid_register_startup()
+setuid_register_startup( void )
 {
   startup_manager_module dependencies[] = {
     STARTUP_MANAGER_MODULE_DISPLAY,
diff --git a/ui/widget/binary.c b/ui/widget/binary.c
index c2d0cd91..e6708447 100644
--- a/ui/widget/binary.c
+++ b/ui/widget/binary.c
@@ -136,7 +136,7 @@ widget_binary_draw( void *data )
 }
 
 static void
-ask_filename()
+ask_filename( void )
 {
   widget_filesel_data filesel;
 
@@ -216,7 +216,7 @@ ask_value( int what )
 }
 
 static void
-load_data()
+load_data( void )
 {
   libspectrum_dword i;
 
@@ -226,7 +226,7 @@ load_data()
 }
 
 static void
-save_data()
+save_data( void )
 {
   int error;
   error = utils_save_binary( widget_binary.start, widget_binary.length,
@@ -365,7 +365,7 @@ widget_binary_finish( widget_finish_state finished )
 }
 
 static void
-init_widget_binary()
+init_widget_binary( void )
 {
   char str[8];
 

[fuse-emulator-cvs] [fuse] 02/04: Mark some functions as static

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

This is an automated email from the git hooks/post-receive-user script.

sbaldovi pushed a commit to branch master
in repository fuse.

View the commit online:
https://sourceforge.net/p/fuse-emulator/fuse/ci/c49ef7ba8372c68565c2b4d066769d57e1543a9c/

commit c49ef7ba8372c68565c2b4d066769d57e1543a9c
Author: Sergio Baldoví <ser...@gm...>
AuthorDate: Sun Mar 14 19:13:08 2021 +0100

    Mark some functions as static
---
 infrastructure/startup_manager.c |  2 +-
 peripherals/joystick.c           |  4 ++--
 svg.c                            | 20 ++++++++++----------
 ui/win32/hyperlinks.c            |  4 ++--
 ui/win32/win32ui.c               |  2 +-
 ui/xlib/xdisplay.c               |  1 -
 ui/xlib/xstatusbar.pl            |  2 +-
 7 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/infrastructure/startup_manager.c b/infrastructure/startup_manager.c
index 4eeca06a..1ba65aad 100644
--- a/infrastructure/startup_manager.c
+++ b/infrastructure/startup_manager.c
@@ -53,7 +53,7 @@ startup_manager_init( void )
     g_array_new( FALSE, FALSE, sizeof( startup_manager_end_fn ) );
 }
 
-void
+static void
 startup_manager_end( void )
 {
   g_array_free( registered_modules, TRUE );
diff --git a/peripherals/joystick.c b/peripherals/joystick.c
index d3edc0dd..6154aad3 100644
--- a/peripherals/joystick.c
+++ b/peripherals/joystick.c
@@ -123,7 +123,7 @@ static const periph_t kempston_loose_periph = {
 
 /* Init/shutdown functions. Errors aren't important here */
 
-int
+static int
 joystick_init( void *context )
 {
   joysticks_supported = ui_joystick_init();
@@ -137,7 +137,7 @@ joystick_init( void *context )
   return 0;
 }
 
-void
+static void
 joystick_end( void )
 {
   ui_joystick_end();
diff --git a/svg.c b/svg.c
index 167c46e2..5b69f97e 100644
--- a/svg.c
+++ b/svg.c
@@ -145,7 +145,7 @@ svg_write_metadata( void )
   return 0;
 }
 
-void
+static void
 svg_openfile( void )
 {
   int err;
@@ -190,7 +190,7 @@ svg_openfile( void )
   }
 }
 
-void
+static void
 svg_rect( int xpos, int ypos, const char *xsize, const char *ysize,
           const char *opacity, const char *color )
 {
@@ -225,7 +225,7 @@ svg_rect( int xpos, int ypos, const char *xsize, const char *ysize,
   }
 }
 
-void
+static void
 svg_openpath( void )
 {
   int err;
@@ -263,7 +263,7 @@ svg_openpath( void )
   }
 }
 
-void
+static void
 svg_closepath( void )
 {
   if( xmlTextWriterEndElement( writer ) < 0 ) {
@@ -272,7 +272,7 @@ svg_closepath( void )
   }
 }
 
-void
+static void
 svg_closefile( void )
 {
   FILE *fp;
@@ -349,7 +349,7 @@ svg_stopcapture( void )
   }
 }
 
-void
+static void
 svg_capture_draw( void )
 {
   char path_element[ BUFSZ ];
@@ -426,7 +426,7 @@ svg_capture_draw( void )
   return;
 }
 
-void
+static void
 svg_byte( int xpos, int ypos, int udg_byte, char *color )
 {
   int i;
@@ -462,7 +462,7 @@ svg_byte( int xpos, int ypos, int udg_byte, char *color )
   }
 }
 
-void
+static void
 svg_capture_char( void )
 {
   char path_element[ BUFSZ ];
@@ -593,7 +593,7 @@ svg_capture_char( void )
   return;
 }
 
-void
+static void
 svg_capture_cls( void )
 {
   if( svg_flag ) {
@@ -614,7 +614,7 @@ svg_capture_cls( void )
   return;
 }
 
-void
+static void
 svg_capture_scroll( void )
 {
   char svgcolor[ BUFSZ ];
diff --git a/ui/win32/hyperlinks.c b/ui/win32/hyperlinks.c
index a0bd5d66..a6248cfd 100644
--- a/ui/win32/hyperlinks.c
+++ b/ui/win32/hyperlinks.c
@@ -29,7 +29,7 @@
 #define PROP_UNDERLINE_FONT     TEXT("_Hyperlink_Underline_Font_")
 
 
-LRESULT CALLBACK 
+static LRESULT CALLBACK
 _HyperlinkParentProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
   WNDPROC pfnOrigProc = (WNDPROC) GetProp(hwnd, PROP_ORIGINAL_PROC);
@@ -58,7 +58,7 @@ _HyperlinkParentProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
   return CallWindowProc(pfnOrigProc, hwnd, message, wParam, lParam);
 }
 
-LRESULT CALLBACK 
+static LRESULT CALLBACK
 _HyperlinkProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
   WNDPROC pfnOrigProc = (WNDPROC) GetProp(hwnd, PROP_ORIGINAL_PROC);
diff --git a/ui/win32/win32ui.c b/ui/win32/win32ui.c
index fd95017b..a5cd6e4a 100755
--- a/ui/win32/win32ui.c
+++ b/ui/win32/win32ui.c
@@ -787,7 +787,7 @@ win32ui_get_monospaced_font( HFONT *font )
   return 0;
 }
 
-int
+static int
 window_recommended_width( HWND hwndDlg, LPCTSTR title )
 {
   HDC dc;
diff --git a/ui/xlib/xdisplay.c b/ui/xlib/xdisplay.c
index 52b6921a..82bb7ad5 100644
--- a/ui/xlib/xdisplay.c
+++ b/ui/xlib/xdisplay.c
@@ -159,7 +159,6 @@ static xdisplay_putpixel_t xdisplay_putpixel_16;
 static xdisplay_putpixel_t xdisplay_putpixel_24;
 
 #include "ui/xlib/xpixmaps.c"
-void xstatusbar_overlay( void );
 
 static libspectrum_word pal_colour[16] = {
   0x0000, 0x0017, 0xb800, 0xb817, 0x05e0, 0x05f7, 0xbde0, 0xbdf7,
diff --git a/ui/xlib/xstatusbar.pl b/ui/xlib/xstatusbar.pl
index d21fef0d..0f753382 100644
--- a/ui/xlib/xstatusbar.pl
+++ b/ui/xlib/xstatusbar.pl
@@ -138,7 +138,7 @@ xstatusbar_put_icon( int x, int w, int h )
   dx -= 4; /* 4px space */
 }
 
-void
+static void
 xstatusbar_overlay( void )
 {
   int x = 0, w = 0, h;

[fuse-emulator-cvs] [fuse] branch master updated (b2f1ea6c -> 240b7940)

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

This is an automated email from the git hooks/post-receive-user script.

sbaldovi pushed a change to branch master
in repository fuse.

    from b2f1ea6c Update dates for 1.6.0 release
     new fcd74aff Add missing 'void' in K&R-style parameter lists
     new c49ef7ba Mark some functions as static
     new db5c27dd Include some prototypes of global functions
     new 240b7940 Remove a C99 comment

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 fuse.c                           |  2 +-
 infrastructure/startup_manager.c |  2 +-
 menu_data.pl                     |  1 +
 peripherals/ide/divmmc.c         |  2 --
 peripherals/joystick.c           |  4 ++--
 svg.c                            | 20 ++++++++++----------
 ui/widget/binary.c               |  8 ++++----
 ui/win32/about.c                 |  1 +
 ui/win32/binary.c                |  1 +
 ui/win32/browse.c                |  1 +
 ui/win32/fileselector.c          |  1 +
 ui/win32/hyperlinks.c            |  4 ++--
 ui/win32/options.pl              |  1 +
 ui/win32/roms.c                  |  1 +
 ui/win32/win32ui.c               |  2 +-
 ui/xlib/xdisplay.c               |  1 -
 ui/xlib/xstatusbar.pl            |  2 +-
 17 files changed, 29 insertions(+), 25 deletions(-)

[fuse-emulator-cvs] [libspectrum] 03/03: Use libspectrum's memory management instead of strdup

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

This is an automated email from the git hooks/post-receive-user script.

sbaldovi pushed a commit to branch master
in repository libspectrum.

View the commit online:
https://sourceforge.net/p/fuse-emulator/libspectrum/ci/3926b3d5f2eb28de1909b09b4513e15c8d791e53/

commit 3926b3d5f2eb28de1909b09b4513e15c8d791e53
Author: Sergio Baldoví <ser...@gm...>
AuthorDate: Sat Mar 13 13:05:27 2021 +0100

    Use libspectrum's memory management instead of strdup
    
    As we usually use libspectrum_free()
---
 internals.h   |  3 +++
 libspectrum.c |  2 +-
 utilities.c   | 15 +++++++++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/internals.h b/internals.h
index 2d474be..67b3ea8 100644
--- a/internals.h
+++ b/internals.h
@@ -362,6 +362,9 @@ libspectrum_bits_to_bytes( size_t bits );
 
 extern const int LIBSPECTRUM_BITS_IN_BYTE;
 
+char*
+libspectrum_safe_strdup( const char *src );
+
 /* glib replacement functions */
 
 #ifndef HAVE_LIB_GLIB		/* Only if we are using glib replacement */
diff --git a/libspectrum.c b/libspectrum.c
index 486bcde..55ba4aa 100644
--- a/libspectrum.c
+++ b/libspectrum.c
@@ -776,7 +776,7 @@ libspectrum_uncompress_file( unsigned char **new_buffer, size_t *new_length,
   }
 
   if( new_filename && old_filename ) {
-    *new_filename = strdup( old_filename );
+    *new_filename = libspectrum_safe_strdup( old_filename );
     if( !*new_filename ) {
       libspectrum_print_error( LIBSPECTRUM_ERROR_MEMORY,
 			       "out of memory at %s:%d", __FILE__, __LINE__ );
diff --git a/utilities.c b/utilities.c
index 09d5d43..9555154 100644
--- a/utilities.c
+++ b/utilities.c
@@ -64,3 +64,18 @@ libspectrum_bits_to_bytes( size_t bits )
 {
   return ( bits + LIBSPECTRUM_BITS_IN_BYTE - 1 ) / LIBSPECTRUM_BITS_IN_BYTE;
 }
+
+char*
+libspectrum_safe_strdup( const char *src )
+{
+  size_t length;
+  char *dest = NULL;
+
+  if( src ) {
+    length = strlen( src ) + 1;
+    dest = libspectrum_new( char, length );
+    memcpy( dest, src, length );
+  }
+
+  return dest;
+}

[fuse-emulator-cvs] [libspectrum] 02/03: Remove unused variable

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

This is an automated email from the git hooks/post-receive-user script.

sbaldovi pushed a commit to branch master
in repository libspectrum.

View the commit online:
https://sourceforge.net/p/fuse-emulator/libspectrum/ci/bd7a8fc784c69d67ccd53b7212c45e4902caad8b/

commit bd7a8fc784c69d67ccd53b7212c45e4902caad8b
Author: Sergio Baldoví <ser...@gm...>
AuthorDate: Sat Mar 13 12:53:40 2021 +0100

    Remove unused variable
---
 szx.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/szx.c b/szx.c
index 51dc7e2..5889de8 100644
--- a/szx.c
+++ b/szx.c
@@ -3517,7 +3517,6 @@ write_if1_chunk( libspectrum_buffer *buffer, libspectrum_buffer *data,
 {
   libspectrum_byte *rom_data = NULL; 
   libspectrum_buffer *rom_buffer;
-  libspectrum_word disk_rom_length = 0;
   libspectrum_word uncompressed_rom_length = 0;
   libspectrum_word flags = 0;
   int use_compression;
@@ -3545,7 +3544,7 @@ write_if1_chunk( libspectrum_buffer *buffer, libspectrum_buffer *data,
                                  snap, 0 ) );
       return LIBSPECTRUM_ERROR_LOGIC;
     }
-    uncompressed_rom_length = disk_rom_length =
+    uncompressed_rom_length =
       libspectrum_snap_interface1_rom_length( snap, 0 );
   }
 

[fuse-emulator-cvs] [libspectrum] 01/03: We need strings.h for strcasecmp()

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

This is an automated email from the git hooks/post-receive-user script.

sbaldovi pushed a commit to branch master
in repository libspectrum.

View the commit online:
https://sourceforge.net/p/fuse-emulator/libspectrum/ci/a722bee5ad717f4ca5375f287085800850eb3e21/

commit a722bee5ad717f4ca5375f287085800850eb3e21
Author: Sergio Baldoví <ser...@gm...>
AuthorDate: Sat Mar 13 12:27:17 2021 +0100

    We need strings.h for strcasecmp()
---
 zip.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/zip.c b/zip.c
index f7931e8..826dfff 100644
--- a/zip.c
+++ b/zip.c
@@ -27,6 +27,9 @@
 #include "config.h"
 
 #include <string.h>
+#ifdef HAVE_STRINGS_H
+#include <strings.h>		/* Needed for strcasecmp() on QNX6 */
+#endif				/* #ifdef HAVE_STRINGS_H */
 
 #define ZLIB_CONST
 #include <zlib.h>

[fuse-emulator-cvs] [libspectrum] branch master updated (dbddb13 -> 3926b3d)

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

This is an automated email from the git hooks/post-receive-user script.

sbaldovi pushed a change to branch master
in repository libspectrum.

    from dbddb13  Tests use libspectrum_snap_write() from public API
     new a722bee  We need strings.h for strcasecmp()
     new bd7a8fc  Remove unused variable
     new 3926b3d  Use libspectrum's memory management instead of strdup

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 internals.h   |  3 +++
 libspectrum.c |  2 +-
 szx.c         |  3 +--
 utilities.c   | 15 +++++++++++++++
 zip.c         |  3 +++
 5 files changed, 23 insertions(+), 3 deletions(-)

[fuse-emulator-cvs] [libspectrum] branch master updated: Tests use libspectrum_snap_write() from public API

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

This is an automated email from the git hooks/post-receive-user script.

sbaldovi pushed a commit to branch master
in repository libspectrum.

View the commit online:
https://sourceforge.net/p/fuse-emulator/libspectrum/ci/dbddb13eb6075c1c018978b66721c06cd40acb7e/

The following commit(s) were added to refs/heads/master by this push:
     new dbddb13  Tests use libspectrum_snap_write() from public API
dbddb13 is described below

commit dbddb13eb6075c1c018978b66721c06cd40acb7e
Author: Sergio Baldoví <ser...@gm...>
AuthorDate: Thu Mar 11 00:42:19 2021 +0100

    Tests use libspectrum_snap_write() from public API
    
    rather than private libspectrum_szx_write() (more from patch #433).
---
 internals.h |  1 -
 test/szx.c  | 24 ++++++++++++++----------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/internals.h b/internals.h
index 2f0c4e8..2d474be 100644
--- a/internals.h
+++ b/internals.h
@@ -190,7 +190,6 @@ libspectrum_sp_read( libspectrum_snap *snap,
 libspectrum_error
 libspectrum_szx_read( libspectrum_snap *snap,
 		      const libspectrum_byte *buffer, size_t buffer_length );
-LIBSPECTRUM_API /* FIXME: we shouldn't export this but test/szx.c is using it */
 libspectrum_error
 libspectrum_szx_write( libspectrum_buffer *buffer, int *out_flags,
                        libspectrum_snap *snap, libspectrum_creator *creator,
diff --git a/test/szx.c b/test/szx.c
index 4850cb5..83972ef 100644
--- a/test/szx.c
+++ b/test/szx.c
@@ -42,7 +42,8 @@ typedef struct szx_chunk_t {
 } szx_chunk_t;
 
 static szx_chunk_t*
-find_szx_chunk( libspectrum_buffer *buffer, const char *search )
+find_szx_chunk( libspectrum_byte *in_buffer, size_t in_buffer_length,
+                const char *search )
 {
   libspectrum_byte *data;
   size_t data_remaining;
@@ -50,8 +51,8 @@ find_szx_chunk( libspectrum_buffer *buffer, const char *search )
   libspectrum_byte length_buffer[4];
   libspectrum_dword length;
 
-  data = libspectrum_buffer_get_data( buffer );
-  data_remaining = libspectrum_buffer_get_data_size( buffer );
+  data = in_buffer;
+  data_remaining = in_buffer_length;
 
   if( data_remaining < 8 ) {
     fprintf( stderr, "SZX file is less than 8 bytes long\n" );
@@ -102,29 +103,32 @@ szx_write_block_test_with_flags( const char *id, libspectrum_machine machine,
     libspectrum_byte *expected, size_t expected_length, size_t total_length )
 {
   libspectrum_snap *snap;
-  libspectrum_buffer *buffer;
+  libspectrum_byte *buffer; size_t length;
   int out_flags;
   szx_chunk_t *chunk;
+  size_t i;
   test_return_t r = TEST_INCOMPLETE;
 
-  buffer = libspectrum_buffer_alloc();
-
   snap = libspectrum_snap_alloc();
 
   libspectrum_snap_set_machine( snap, machine );
 
   setter( snap );
 
-  libspectrum_szx_write( buffer, &out_flags, snap, NULL, flags );
+  length = 0;
+  buffer = NULL;
+  libspectrum_snap_write( &buffer, &length, &out_flags, snap,
+                          LIBSPECTRUM_ID_SNAPSHOT_SZX, NULL, flags );
   libspectrum_snap_free( snap );
 
-  chunk = find_szx_chunk( buffer, id );
+  chunk = find_szx_chunk( buffer, length, id );
   if( !chunk ) {
     fprintf( stderr, "Chunk not found\n" );
+    libspectrum_free( buffer );
     return TEST_FAIL;
   }
 
-  libspectrum_buffer_free( buffer );
+  libspectrum_free( buffer );
 
   if( chunk->length == total_length ) {
     if( memcmp( chunk->data, expected, expected_length ) ) {
@@ -132,7 +136,7 @@ szx_write_block_test_with_flags( const char *id, libspectrum_machine machine,
       r = TEST_FAIL;
     } else {
       r = TEST_PASS;
-      for( size_t i = expected_length; i < total_length; i++ ) {
+      for( i = expected_length; i < total_length; i++ ) {
         if( chunk->data[i] ) {
           r = TEST_FAIL;
           break;

[fuse-emulator-cvs] [libspectrum] branch master updated: Use local #includes for config.h and libspectrum.h

[<fr...@us...>]

This is an automated email from the git hooks/post-receive-user script.

fredm pushed a commit to branch master
in repository libspectrum.

View the commit online:
https://sourceforge.net/p/fuse-emulator/libspectrum/ci/c32fe4d7576408eb85edac97e7af25c3cd52b467/

The following commit(s) were added to refs/heads/master by this push:
     new c32fe4d  Use local #includes for config.h and libspectrum.h
c32fe4d is described below

commit c32fe4d7576408eb85edac97e7af25c3cd52b467
Author: Fredrick Meunier <fr...@sp...>
AuthorDate: Wed Mar 10 20:58:14 2021 +1100

    Use local #includes for config.h and libspectrum.h
---
 ChangeLog         | 2 ++
 accessor.pl       | 2 +-
 tape_accessors.pl | 2 +-
 tape_set.pl       | 2 +-
 zip.h             | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a25cdff..e4109fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
             Garcia).
           * Run tests on 'make check' invocation (Alberto Garcia).
           * Don't generate an edge for the STOP48 TZX block (Fredrick Meunier).
+          * Use local include directives for config.h and libspectrum.h
+            (Fredrick Meunier).
 
 2021-02-27  Philip Kendall  <phi...@sh...>
 
diff --git a/accessor.pl b/accessor.pl
index 5810c03..37b4cdd 100755
--- a/accessor.pl
+++ b/accessor.pl
@@ -83,7 +83,7 @@ print << "CODE";
 
 /* NB: this file is autogenerated from snap_accessors.txt by accessor.pl */
 
-#include <config.h>
+#include "config.h"
 
 #include "internals.h"
 
diff --git a/tape_accessors.pl b/tape_accessors.pl
index b3dbd9d..221f305 100755
--- a/tape_accessors.pl
+++ b/tape_accessors.pl
@@ -49,7 +49,7 @@ print << "CODE";
 
 /* NB: this file is autogenerated from $ARGV[0] by $0 */
 
-#include <config.h>
+#include "config.h"
 
 #include "internals.h"
 #include "tape_block.h"
diff --git a/tape_set.pl b/tape_set.pl
index 47101a3..d155c8b 100755
--- a/tape_set.pl
+++ b/tape_set.pl
@@ -49,7 +49,7 @@ print << "CODE";
 
 /* NB: this file is autogenerated from $ARGV[0] by $0 */
 
-#include <config.h>
+#include "config.h"
 
 #include "internals.h"
 #include "tape_block.h"
diff --git a/zip.h b/zip.h
index 9cbbe94..51de587 100644
--- a/zip.h
+++ b/zip.h
@@ -27,7 +27,7 @@
 #ifndef LIBSPECTRUM_ZIP_H
 #define LIBSPECTRUM_ZIP_H
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #define ZIP_DIRECTORY_INFO_SIG 0x06054b50
 #define ZIP_FILE_HEADER_SIG    0x02014b50

[fuse-emulator-cvs] [libspectrum] branch master updated: Don't generate an edge for the STOP48 TZX block

[<fr...@us...>]

This is an automated email from the git hooks/post-receive-user script.

fredm pushed a commit to branch master
in repository libspectrum.

View the commit online:
https://sourceforge.net/p/fuse-emulator/libspectrum/ci/36d3bec785712e52b7cd5060ee06816dedd7948e/

The following commit(s) were added to refs/heads/master by this push:
     new 36d3bec  Don't generate an edge for the STOP48 TZX block
36d3bec is described below

commit 36d3bec785712e52b7cd5060ee06816dedd7948e
Author: Fredrick Meunier <fr...@sp...>
AuthorDate: Wed Mar 10 20:47:26 2021 +1100

    Don't generate an edge for the STOP48 TZX block
---
 ChangeLog         |  1 +
 tape.c            |  5 ++++-
 test/test_edges.c | 30 ++++++++++++++++--------------
 3 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d065190..a25cdff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@
           * Hide all symbols except the ones in the public API (Alberto
             Garcia).
           * Run tests on 'make check' invocation (Alberto Garcia).
+          * Don't generate an edge for the STOP48 TZX block (Fredrick Meunier).
 
 2021-02-27  Philip Kendall  <phi...@sh...>
 
diff --git a/tape.c b/tape.c
index b3776f1..8809cd7 100644
--- a/tape.c
+++ b/tape.c
@@ -437,7 +437,10 @@ libspectrum_tape_get_next_edge_internal( libspectrum_dword *tstates,
       break;
 
     case LIBSPECTRUM_TAPE_BLOCK_STOP48:
-      *tstates = 0; *flags |= LIBSPECTRUM_TAPE_FLAGS_STOP48; end_of_block = 1;
+      *tstates = 0;
+      *flags |= LIBSPECTRUM_TAPE_FLAGS_STOP48;
+      *flags |= LIBSPECTRUM_TAPE_FLAGS_NO_EDGE;
+      end_of_block = 1;
       break;
 
     case LIBSPECTRUM_TAPE_BLOCK_SET_SIGNAL_LEVEL:
diff --git a/test/test_edges.c b/test/test_edges.c
index b6a4b7f..eb3c787 100644
--- a/test/test_edges.c
+++ b/test/test_edges.c
@@ -61,48 +61,48 @@ complete_edges_list[] =
   { 2163000, 1, 0 },
 
   /* Group start block */
-  {    0,    1, 0 },
+  {    0,    1, 8 },
 
   /* Group end block */
-  {    0,    1, 0 },
+  {    0,    1, 8 },
 
   /* Jump block */
-  {    0,    1, 0 },
+  {    0,    1, 8 },
 
   /* Pure tone block skipped */
 
   /* Loop start block */
-  {    0,    1, 0 },
+  {    0,    1, 8 },
 
     /* Iteration 1 */
     {  837,  185, 0 },	/* Pure tone block */
-    {    0,    1, 0 },	/* Loop end block */
+    {    0,    1, 8 },	/* Loop end block */
 
     /* Iteration 2 */
     {  837,  185, 0 },	/* Pure tone block */
-    {    0,    1, 0 },	/* Loop end block */
+    {    0,    1, 8 },	/* Loop end block */
 
     /* Iteration 3 */
     {  837,  185, 0 },	/* Pure tone block */
-    {    0,    1, 0 },	/* Loop end block */
+    {    0,    1, 8 },	/* Loop end block */
 
   /* Stop tape if in 48K mode block */
-  {    0,    1, 4 },
+  {    0,    1, 12 },
 
   /* Text description block */
-  {    0,    1, 0 },
+  {    0,    1, 8 },
 
   /* Message block */
-  {    0,    1, 0 },
+  {    0,    1, 8 },
 
   /* Archive info block */
-  {    0,    1, 0 },
+  {    0,    1, 8 },
 
   /* Hardware info block */
-  {    0,    1, 0 },
+  {    0,    1, 8 },
 
   /* Custom info block */
-  {    0,    1, 0 },
+  {    0,    1, 8 },
 
   /* Pure tone block */
   {  820,  940, 0 },
@@ -116,7 +116,9 @@ test_return_t
 test_15( void )
 {
   return check_edges( DYNAMIC_TEST_PATH( "complete-tzx.tzx" ), complete_edges_list,
-		      LIBSPECTRUM_TAPE_FLAGS_STOP | LIBSPECTRUM_TAPE_FLAGS_STOP48 );
+		      LIBSPECTRUM_TAPE_FLAGS_STOP |
+		      LIBSPECTRUM_TAPE_FLAGS_STOP48 |
+		      LIBSPECTRUM_TAPE_FLAGS_NO_EDGE );
 }
 
 static test_edge_sequence_t

[fuse-emulator-cvs] [libspectrum] branch master updated: Hide all symbols except the ones in the public API

[<fr...@us...>]

This is an automated email from the git hooks/post-receive-user script.

fredm pushed a commit to branch master
in repository libspectrum.

View the commit online:
https://sourceforge.net/p/fuse-emulator/libspectrum/ci/da6be4186477de4a1b74a283b8cd5c0d527015d5/

The following commit(s) were added to refs/heads/master by this push:
     new da6be41  Hide all symbols except the ones in the public API
da6be41 is described below

commit da6be4186477de4a1b74a283b8cd5c0d527015d5
Author: Alberto Garcia <be...@ig...>
AuthorDate: Sun Mar 7 09:40:14 2021 +1100

    Hide all symbols except the ones in the public API
---
 ChangeLog           |   2 +
 Makefile.am         |   2 +-
 doc/libspectrum.txt |   2 +-
 generate.pl.in      |  16 +-
 internals.h         |   1 +
 libspectrum.h.in    | 420 ++++++++++++++++++++++++++--------------------------
 make-perl.c         | 166 ++++++++++++---------
 tape.c              |   2 +-
 8 files changed, 322 insertions(+), 289 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1f00adc..d065190 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 
         * Various minor bug fixes/improvements:
           * Fix PZX handling on big endian systems (Alberto Garcia).
+          * Hide all symbols except the ones in the public API (Alberto
+            Garcia).
           * Run tests on 'make check' invocation (Alberto Garcia).
 
 2021-02-27  Philip Kendall  <phi...@sh...>
diff --git a/Makefile.am b/Makefile.am
index 4d47afc..9fb8e77 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -95,7 +95,7 @@ noinst_DATA =
 # PKG_INSTALLDIR in configure.ac.
 pkgconfig_DATA = libspectrum.pc
 
-AM_CFLAGS = -DLIBSPECTRUM_EXPORTS
+AM_CFLAGS = -DLIBSPECTRUM_EXPORTS -fvisibility=hidden
 
 make-perl$(EXEEXT): $(srcdir)/make-perl.c config.h
 	$(AM_V_CC)$(CC_FOR_BUILD) -I. -o $@ $<
diff --git a/doc/libspectrum.txt b/doc/libspectrum.txt
index af8ef8b..714d95d 100644
--- a/doc/libspectrum.txt
+++ b/doc/libspectrum.txt
@@ -1023,7 +1023,7 @@ libspectrum_tape_peek_next_block( libspectrum_tape *tape )
 Get the next block on the tape, but don't move the tape along or
 initialise the block.
 
-libspectrum_tape_block WIN32_DLL *
+libspectrum_tape_block LIBSPECTRUM_API *
 libspectrum_tape_peek_last_block( libspectrum_tape *tape )
 
 Get the last block on the tape, but don't move the tape along or
diff --git a/generate.pl.in b/generate.pl.in
index 68e7fd7..5d4a8bc 100644
--- a/generate.pl.in
+++ b/generate.pl.in
@@ -34,23 +34,23 @@ if( /LIBSPECTRUM_SNAP_ACCESSORS/ ) {
 
     my $return_type;
     if( $type =~ /^(.*)\*/ ) {
-	$return_type = "WIN32_DLL $1 *";
+	$return_type = "LIBSPECTRUM_API $1 *";
     } else {
-	$return_type = "WIN32_DLL $type";
+	$return_type = "LIBSPECTRUM_API $type";
     }
 
     if( $indexed ) {
 
 	print << "CODE";
 $return_type libspectrum_snap_$name( libspectrum_snap *snap, int idx );
-WIN32_DLL void libspectrum_snap_set_$name( libspectrum_snap *snap, int idx, $type $name );
+LIBSPECTRUM_API void libspectrum_snap_set_$name( libspectrum_snap *snap, int idx, $type $name );
 CODE
 
     } else {
 
 	print << "CODE";
 $return_type libspectrum_snap_$name( libspectrum_snap *snap );
-WIN32_DLL void libspectrum_snap_set_$name( libspectrum_snap *snap, $type $name );
+LIBSPECTRUM_API void libspectrum_snap_set_$name( libspectrum_snap *snap, $type $name );
 CODE
 
     }
@@ -76,23 +76,23 @@ if( /LIBSPECTRUM_TAPE_ACCESSORS/ ) {
 	
 	my $return_type;
 	if( $type =~ /^(.*)\*/ ) {
-	    $return_type = "WIN32_DLL $1 *";
+	    $return_type = "LIBSPECTRUM_API $1 *";
 	} else {
-	    $return_type = "WIN32_DLL $type";
+	    $return_type = "LIBSPECTRUM_API $type";
 	}
 
 	if( $indexed ) {
 
 	  print << "CODE";
 $return_type libspectrum_tape_block_$name( libspectrum_tape_block *block, size_t idx );
-WIN32_DLL libspectrum_error libspectrum_tape_block_set_$name( libspectrum_tape_block *block, $type \*$name );
+LIBSPECTRUM_API libspectrum_error libspectrum_tape_block_set_$name( libspectrum_tape_block *block, $type \*$name );
 CODE
 
 	} else {
 
 	print << "CODE";
 $return_type libspectrum_tape_block_$name( libspectrum_tape_block *block );
-WIN32_DLL libspectrum_error libspectrum_tape_block_set_$name( libspectrum_tape_block *block, $type $name );
+LIBSPECTRUM_API libspectrum_error libspectrum_tape_block_set_$name( libspectrum_tape_block *block, $type $name );
 CODE
     
 	}
diff --git a/internals.h b/internals.h
index 2d474be..2f0c4e8 100644
--- a/internals.h
+++ b/internals.h
@@ -190,6 +190,7 @@ libspectrum_sp_read( libspectrum_snap *snap,
 libspectrum_error
 libspectrum_szx_read( libspectrum_snap *snap,
 		      const libspectrum_byte *buffer, size_t buffer_length );
+LIBSPECTRUM_API /* FIXME: we shouldn't export this but test/szx.c is using it */
 libspectrum_error
 libspectrum_szx_write( libspectrum_buffer *buffer, int *out_flags,
                        libspectrum_snap *snap, libspectrum_creator *creator,
diff --git a/libspectrum.h.in b/libspectrum.h.in
index bee106c..8c11f44 100644
--- a/libspectrum.h.in
+++ b/libspectrum.h.in
@@ -51,21 +51,25 @@ extern "C" {
 #endif				/* #ifndef WIN32_LEAN_AND_MEAN */
 
 #ifdef LIBSPECTRUM_EXPORTS
-#define WIN32_DLL __declspec( dllexport )
+#define LIBSPECTRUM_API __declspec( dllexport )
 #else				/* #ifdef LIBSPECTRUM_EXPORTS */
-#define WIN32_DLL __declspec( dllimport )
+#define LIBSPECTRUM_API __declspec( dllimport )
 #endif				/* #ifdef LIBSPECTRUM_EXPORTS */
 
 #else				/* #ifdef _WIN32 */
 
-#define WIN32_DLL
+#ifdef LIBSPECTRUM_EXPORTS
+#define LIBSPECTRUM_API __attribute__ ((visibility ("default")))
+#else
+#define LIBSPECTRUM_API
+#endif
 
 #endif				/* #ifdef _WIN32 */
 
 #ifdef __GNUC__
 #define DEPRECATED __attribute__((deprecated))
 #else                           /* #ifdef __GNUC__ */
-#define DEPRECATED 
+#define DEPRECATED
 #endif                          /* #ifdef __GNUC__ */
 
 LIBSPECTRUM_INCLUDE_GCRYPT
@@ -105,23 +109,23 @@ LIBSPECTRUM_CAPABILITIES
 
 /* Initialisation */
 
-WIN32_DLL libspectrum_error libspectrum_init( void );
-WIN32_DLL void libspectrum_end( void );
+LIBSPECTRUM_API libspectrum_error libspectrum_init( void );
+LIBSPECTRUM_API void libspectrum_end( void );
 
 /* Version checking */
 
-WIN32_DLL int libspectrum_check_version( const char *version );
-WIN32_DLL const char *libspectrum_version( void );
-WIN32_DLL const char *libspectrum_gcrypt_version( void );
+LIBSPECTRUM_API int libspectrum_check_version( const char *version );
+LIBSPECTRUM_API const char *libspectrum_version( void );
+LIBSPECTRUM_API const char *libspectrum_gcrypt_version( void );
 
 /* Error handling */
 typedef libspectrum_error
 (*libspectrum_error_function_t)( libspectrum_error error,
 				 const char *format, va_list ap );
 
-extern WIN32_DLL libspectrum_error_function_t libspectrum_error_function;
+extern LIBSPECTRUM_API libspectrum_error_function_t libspectrum_error_function;
 
-WIN32_DLL libspectrum_error
+LIBSPECTRUM_API libspectrum_error
 libspectrum_default_error_function( libspectrum_error error,
 				    const char *format, va_list ap );
 
@@ -139,14 +143,14 @@ typedef struct libspectrum_mem_vtable_t {
   libspectrum_free_fn_t free;
 } libspectrum_mem_vtable_t;
 
-WIN32_DLL void* libspectrum_malloc( size_t size );
-WIN32_DLL void* libspectrum_malloc_n( size_t nmemb, size_t size );
-WIN32_DLL void* libspectrum_malloc0_n( size_t nmemb, size_t size );
-WIN32_DLL void* libspectrum_realloc( void *ptr, size_t size );
-WIN32_DLL void* libspectrum_realloc_n( void *ptr, size_t nmemb, size_t size );
-WIN32_DLL void libspectrum_free( void *ptr );
+LIBSPECTRUM_API void* libspectrum_malloc( size_t size );
+LIBSPECTRUM_API void* libspectrum_malloc_n( size_t nmemb, size_t size );
+LIBSPECTRUM_API void* libspectrum_malloc0_n( size_t nmemb, size_t size );
+LIBSPECTRUM_API void* libspectrum_realloc( void *ptr, size_t size );
+LIBSPECTRUM_API void* libspectrum_realloc_n( void *ptr, size_t nmemb, size_t size );
+LIBSPECTRUM_API void libspectrum_free( void *ptr );
 
-WIN32_DLL void libspectrum_mem_set_vtable( libspectrum_mem_vtable_t *table );
+LIBSPECTRUM_API void libspectrum_mem_set_vtable( libspectrum_mem_vtable_t *table );
 
 #define libspectrum_new( type, count ) \
   ( ( type * ) libspectrum_malloc_n( (count), sizeof( type ) ) )
@@ -186,7 +190,7 @@ typedef enum libspectrum_id_t {
 
   /* Below here, present only in 0.2.0 and later */
 
-  LIBSPECTRUM_ID_TAPE_WARAJEVO,		/* Warajevo-style .tap tape image */ 
+  LIBSPECTRUM_ID_TAPE_WARAJEVO,		/* Warajevo-style .tap tape image */
 
   LIBSPECTRUM_ID_SNAPSHOT_PLUSD,	/* DISCiPLE/+D snapshot */
   LIBSPECTRUM_ID_SNAPSHOT_SP,		/* .sp snapshot */
@@ -307,64 +311,64 @@ typedef enum libspectrum_class_t {
 
 typedef struct libspectrum_buffer libspectrum_buffer;
 
-WIN32_DLL libspectrum_buffer*
+LIBSPECTRUM_API libspectrum_buffer*
 libspectrum_buffer_alloc( void );
-WIN32_DLL void
+LIBSPECTRUM_API void
 libspectrum_buffer_reallocate( libspectrum_buffer *buffer, size_t new_size );
-WIN32_DLL void
+LIBSPECTRUM_API void
 libspectrum_buffer_free( libspectrum_buffer *buffer );
 
-WIN32_DLL int
+LIBSPECTRUM_API int
 libspectrum_buffer_is_empty( const libspectrum_buffer *buffer );
-WIN32_DLL int
+LIBSPECTRUM_API int
 libspectrum_buffer_is_not_empty( const libspectrum_buffer *buffer );
 
-WIN32_DLL void
+LIBSPECTRUM_API void
 libspectrum_buffer_write_byte( libspectrum_buffer *buffer,
                                libspectrum_byte data );
-WIN32_DLL void
+LIBSPECTRUM_API void
 libspectrum_buffer_write_word( libspectrum_buffer *buffer,
                                libspectrum_word data );
-WIN32_DLL void
+LIBSPECTRUM_API void
 libspectrum_buffer_write_dword( libspectrum_buffer *buffer,
                                 libspectrum_dword data );
-WIN32_DLL void
+LIBSPECTRUM_API void
 libspectrum_buffer_write_buffer( libspectrum_buffer *dest,
                                  const libspectrum_buffer *src );
-WIN32_DLL void
+LIBSPECTRUM_API void
 libspectrum_buffer_write( libspectrum_buffer *buffer, const void *data,
                           size_t size );
-WIN32_DLL void
+LIBSPECTRUM_API void
 libspectrum_buffer_set( libspectrum_buffer *buffer, libspectrum_byte value,
                         size_t size );
 
-WIN32_DLL size_t
+LIBSPECTRUM_API size_t
 libspectrum_buffer_get_data_size( const libspectrum_buffer *buffer );
-WIN32_DLL libspectrum_byte*
+LIBSPECTRUM_API libspectrum_byte*
 libspectrum_buffer_get_data( const libspectrum_buffer *buffer );
 
-WIN32_DLL void
+LIBSPECTRUM_API void
 libspectrum_buffer_clear( libspectrum_buffer *buffer );
 
-WIN32_DLL void
+LIBSPECTRUM_API void
 libspectrum_buffer_append( libspectrum_byte **buffer, size_t *length,
                            libspectrum_byte **ptr,
                            const libspectrum_buffer *src );
 
-WIN32_DLL libspectrum_error
+LIBSPECTRUM_API libspectrum_error
 libspectrum_identify_file( libspectrum_id_t *type, const char *filename,
                            const unsigned char *buffer, size_t length );
 
-WIN32_DLL libspectrum_error
+LIBSPECTRUM_API libspectrum_error
 libspectrum_identify_file_with_class(
   libspectrum_id_t *type, libspectrum_class_t *libspectrum_class,
   const char *filename, const unsigned char *buffer, size_t length );
 
-WIN32_DLL libspectrum_error
+LIBSPECTRUM_API libspectrum_error
 libspectrum_identify_file_raw( libspectrum_id_t *type, const char *filename,
 			       const unsigned char *buffer, size_t length );
 
-WIN32_DLL libspectrum_error
+LIBSPECTRUM_API libspectrum_error
 libspectrum_identify_class( libspectrum_class_t *libspectrum_class,
                             libspectrum_id_t type );
 
@@ -403,122 +407,122 @@ typedef enum libspectrum_machine {
 
 } libspectrum_machine;
 
-WIN32_DLL const char* libspectrum_machine_name( libspectrum_machine type );
+LIBSPECTRUM_API const char* libspectrum_machine_name( libspectrum_machine type );
 
 /* The various capabilities of the different machines */
-extern WIN32_DLL const int
+extern LIBSPECTRUM_API const int
 LIBSPECTRUM_MACHINE_CAPABILITY_AY;                              /* AY-3-8192 */
-extern WIN32_DLL const int
+extern LIBSPECTRUM_API const int
 LIBSPECTRUM_MACHINE_CAPABILITY_128_MEMORY;        /* 128-style memory paging */
-extern WIN32_DLL const int
+extern LIBSPECTRUM_API const int
 LIBSPECTRUM_MACHINE_CAPABILITY_PLUS3_MEMORY;       /* +3-style memory paging */
-extern WIN32_DLL const int
+extern LIBSPECTRUM_API const int
 LIBSPECTRUM_MACHINE_CAPABILITY_PLUS3_DISK;            /* +3-style disk drive */
-extern WIN32_DLL const int
+extern LIBSPECTRUM_API const int
 LIBSPECTRUM_MACHINE_CAPABILITY_TIMEX_MEMORY;    /* Timex-style memory paging */
-extern WIN32_DLL const int
+extern LIBSPECTRUM_API const int
 LIBSPECTRUM_MACHINE_CAPABILITY_TIMEX_VIDEO;       /* Timex-style video modes */
-extern WIN32_DLL const int
+extern LIBSPECTRUM_API const int
 LIBSPECTRUM_MACHINE_CAPABILITY_TRDOS_DISK;         /* TRDOS-style disk drive */
-extern WIN32_DLL const int
+extern LIBSPECTRUM_API const int
 LIBSPECTRUM_MACHINE_CAPABILITY_TIMEX_DOCK; /* T[SC]2068-style cartridge port */
-extern WIN32_DLL const int
+extern LIBSPECTRUM_API const int
 LIBSPECTRUM_MACHINE_CAPABILITY_SINCLAIR_JOYSTICK;
                                             /* Sinclair-style joystick ports */
-extern WIN32_DLL const int
+extern LIBSPECTRUM_API const int
 LIBSPECTRUM_MACHINE_CAPABILITY_KEMPSTON_JOYSTICK;
                                             /* Kempston-style joystick ports */
-extern WIN32_DLL const int
+extern LIBSPECTRUM_API const int
 LIBSPECTRUM_MACHINE_CAPABILITY_SCORP_MEMORY; /* Scorpion-style memory paging */
-extern WIN32_DLL const int
+extern LIBSPECTRUM_API const int
 LIBSPECTRUM_MACHINE_CAPABILITY_EVEN_M1;
                              /* M1 cycles always start on even tstate counts */
-extern WIN32_DLL const int
+extern LIBSPECTRUM_API const int
 LIBSPECTRUM_MACHINE_CAPABILITY_SE_MEMORY;          /* SE-style memory paging */
-extern WIN32_DLL const int
+extern LIBSPECTRUM_API const int
 LIBSPECTRUM_MACHINE_CAPABILITY_NTSC;                         /* NTSC display */
-extern WIN32_DLL const int
+extern LIBSPECTRUM_API const int
 LIBSPECTRUM_MACHINE_CAPABILITY_PENT512_MEMORY; /* Pentagon 512 memory paging */
-extern WIN32_DLL const int
+extern LIBSPECTRUM_API const int
 LIBSPECTRUM_MACHINE_CAPABILITY_PENT1024_MEMORY;
 					      /* Pentagon 1024 memory paging */
 
 /* Get the capabilities of a machine */
-WIN32_DLL int libspectrum_machine_capabilities( libspectrum_machine type );
+LIBSPECTRUM_API int libspectrum_machine_capabilities( libspectrum_machine type );
 
 /* Get the timings of a machine */
-WIN32_DLL libspectrum_dword
+LIBSPECTRUM_API libspectrum_dword
 libspectrum_timings_processor_speed( libspectrum_machine machine );
-WIN32_DLL libspectrum_dword
+LIBSPECTRUM_API libspectrum_dword
 libspectrum_timings_ay_speed( libspectrum_machine machine );
-WIN32_DLL libspectrum_word
+LIBSPECTRUM_API libspectrum_word
 libspectrum_timings_left_border( libspectrum_machine machine );
-WIN32_DLL libspectrum_word
+LIBSPECTRUM_API libspectrum_word
 libspectrum_timings_horizontal_screen( libspectrum_machine machine );
-WIN32_DLL libspectrum_word
+LIBSPECTRUM_API libspectrum_word
 libspectrum_timings_right_border( libspectrum_machine machine );
-WIN32_DLL libspectrum_word
+LIBSPECTRUM_API libspectrum_word
 libspectrum_timings_horizontal_retrace( libspectrum_machine machine );
-WIN32_DLL libspectrum_word
+LIBSPECTRUM_API libspectrum_word
 libspectrum_timings_top_border( libspectrum_machine machine );
-WIN32_DLL libspectrum_word
+LIBSPECTRUM_API libspectrum_word
 libspectrum_timings_vertical_screen( libspectrum_machine machine );
-WIN32_DLL libspectrum_word
+LIBSPECTRUM_API libspectrum_word
 libspectrum_timings_bottom_border( libspectrum_machine machine );
-WIN32_DLL libspectrum_word
+LIBSPECTRUM_API libspectrum_word
 libspectrum_timings_vertical_retrace( libspectrum_machine machine );
-WIN32_DLL libspectrum_word
+LIBSPECTRUM_API libspectrum_word
 libspectrum_timings_interrupt_length( libspectrum_machine machine );
-WIN32_DLL libspectrum_word
+LIBSPECTRUM_API libspectrum_word
 libspectrum_timings_top_left_pixel( libspectrum_machine machine );
-WIN32_DLL libspectrum_word
+LIBSPECTRUM_API libspectrum_word
 libspectrum_timings_tstates_per_line( libspectrum_machine machine );
-WIN32_DLL libspectrum_word
+LIBSPECTRUM_API libspectrum_word
 libspectrum_timings_lines_per_frame( libspectrum_machine machine );
-WIN32_DLL libspectrum_dword
+LIBSPECTRUM_API libspectrum_dword
 libspectrum_timings_tstates_per_frame( libspectrum_machine machine );
 
 /* Creator information */
 
 typedef struct libspectrum_creator libspectrum_creator;
 
-WIN32_DLL libspectrum_creator*
+LIBSPECTRUM_API libspectrum_creator*
 libspectrum_creator_alloc( void );
-WIN32_DLL libspectrum_error
+LIBSPECTRUM_API libspectrum_error
 libspectrum_creator_free( libspectrum_creator *creator );
 
-WIN32_DLL libspectrum_error
+LIBSPECTRUM_API libspectrum_error
 libspectrum_creator_set_program( libspectrum_creator *creator,
 				 const char *program );
-WIN32_DLL const char *
+LIBSPECTRUM_API const char *
 libspectrum_creator_program( libspectrum_creator *creator );
 
-WIN32_DLL libspectrum_error
+LIBSPECTRUM_API libspectrum_error
 libspectrum_creator_set_major( libspectrum_creator *creator,
 			       libspectrum_word major );
-WIN32_DLL libspectrum_word
+LIBSPECTRUM_API libspectrum_word
 libspectrum_creator_major( libspectrum_creator *creator );
 
-WIN32_DLL libspectrum_error
+LIBSPECTRUM_API libspectrum_error
 libspectrum_creator_set_minor( libspectrum_creator *creator,
 			       libspectrum_word minor );
-WIN32_DLL libspectrum_word
+LIBSPECTRUM_API libspectrum_word
 libspectrum_creator_minor( libspectrum_creator *creator );
 
-WIN32_DLL libspectrum_error
+LIBSPECTRUM_API libspectrum_error
 libspectrum_creator_set_competition_code( libspectrum_creator *creator,
 					  libspectrum_dword competition_code );
-WIN32_DLL libspectrum_dword
+LIBSPECTRUM_API libspectrum_dword
 libspectrum_creator_competition_code( libspectrum_creator *creator );
 
-WIN32_DLL libspectrum_error
+LIBSPECTRUM_API libspectrum_error
 libspectrum_creator_set_custom( libspectrum_creator *creator,
 				libspectrum_byte *data, size_t length );
 
-WIN32_DLL libspectrum_byte *
+LIBSPECTRUM_API libspectrum_byte *
 libspectrum_creator_custom( libspectrum_creator *creator );
 
-WIN32_DLL size_t
+LIBSPECTRUM_API size_t
 libspectrum_creator_custom_length( libspectrum_creator *creator );
 
 /*
@@ -527,29 +531,29 @@ libspectrum_creator_custom_length( libspectrum_creator *creator );
 
 typedef struct libspectrum_snap libspectrum_snap;
 
-WIN32_DLL libspectrum_snap* libspectrum_snap_alloc( void );
-WIN32_DLL libspectrum_error libspectrum_snap_free( libspectrum_snap *snap );
+LIBSPECTRUM_API libspectrum_snap* libspectrum_snap_alloc( void );
+LIBSPECTRUM_API libspectrum_error libspectrum_snap_free( libspectrum_snap *snap );
 
 /* Read in a snapshot, optionally guessing what type it is */
-WIN32_DLL libspectrum_error
+LIBSPECTRUM_API libspectrum_error
 libspectrum_snap_read( libspectrum_snap *snap, const libspectrum_byte *buffer,
 		       size_t length, libspectrum_id_t type,
 		       const char *filename );
 
 /* Write a snapshot */
-WIN32_DLL libspectrum_error
+LIBSPECTRUM_API libspectrum_error
 libspectrum_snap_write( libspectrum_byte **buffer, size_t *length,
 			int *out_flags, libspectrum_snap *snap,
 			libspectrum_id_t type, libspectrum_creator *creator,
 			int in_flags );
 
 /* The flags that can be given to libspectrum_snap_write() */
-extern WIN32_DLL const int LIBSPECTRUM_FLAG_SNAPSHOT_NO_COMPRESSION;
-extern WIN32_DLL const int LIBSPECTRUM_FLAG_SNAPSHOT_ALWAYS_COMPRESS;
+extern LIBSPECTRUM_API const int LIBSPECTRUM_FLAG_SNAPSHOT_NO_COMPRESSION;
+extern LIBSPECTRUM_API const int LIBSPECTRUM_FLAG_SNAPSHOT_ALWAYS_COMPRESS;
 
 /* The flags that may be returned from libspectrum_snap_write() */
-extern WIN32_DLL const int LIBSPECTRUM_FLAG_SNAPSHOT_MINOR_INFO_LOSS;
-extern WIN32_DLL const int LIBSPECTRUM_FLAG_SNAPSHOT_MAJOR_INFO_LOSS;
+extern LIBSPECTRUM_API const int LIBSPECTRUM_FLAG_SNAPSHOT_MINOR_INFO_LOSS;
+extern LIBSPECTRUM_API const int LIBSPECTRUM_FLAG_SNAPSHOT_MAJOR_INFO_LOSS;
 
 /* The joystick types we can handle */
 typedef enum libspectrum_joystick {
@@ -566,12 +570,12 @@ typedef enum libspectrum_joystick {
 
 } libspectrum_joystick;
 
-WIN32_DLL const char* libspectrum_joystick_name( libspectrum_joystick type );
+LIBSPECTRUM_API const char* libspectrum_joystick_name( libspectrum_joystick type );
 
-extern WIN32_DLL const int LIBSPECTRUM_JOYSTICK_INPUT_NONE;
-extern WIN32_DLL const int LIBSPECTRUM_JOYSTICK_INPUT_KEYBOARD;
-extern WIN32_DLL const int LIBSPECTRUM_JOYSTICK_INPUT_JOYSTICK_1;
-extern WIN32_DLL const int LIBSPECTRUM_JOYSTICK_INPUT_JOYSTICK_2;
+extern LIBSPECTRUM_API const int LIBSPECTRUM_JOYSTICK_INPUT_NONE;
+extern LIBSPECTRUM_API const int LIBSPECTRUM_JOYSTICK_INPUT_KEYBOARD;
+extern LIBSPECTRUM_API const int LIBSPECTRUM_JOYSTICK_INPUT_JOYSTICK_1;
+extern LIBSPECTRUM_API const int LIBSPECTRUM_JOYSTICK_INPUT_JOYSTICK_2;
 
 /* Accessor functions */
 LIBSPECTRUM_SNAP_ACCESSORS
@@ -633,17 +637,17 @@ typedef struct libspectrum_tape_generalised_data_symbol_table libspectrum_tape_g
 typedef struct _GSList *libspectrum_tape_iterator;
 
 /* Some flags */
-extern WIN32_DLL const int LIBSPECTRUM_TAPE_FLAGS_BLOCK;  /* End of block */
-extern WIN32_DLL const int LIBSPECTRUM_TAPE_FLAGS_STOP;	  /* Stop tape */
-extern WIN32_DLL const int LIBSPECTRUM_TAPE_FLAGS_STOP48; /* Stop tape if in 48K mode */
-extern WIN32_DLL const int LIBSPECTRUM_TAPE_FLAGS_NO_EDGE; /* Edge isn't really an edge */
-extern WIN32_DLL const int LIBSPECTRUM_TAPE_FLAGS_LEVEL_LOW; /* Set level low */
-extern WIN32_DLL const int LIBSPECTRUM_TAPE_FLAGS_LEVEL_HIGH; /* Set level high */
-extern WIN32_DLL const int LIBSPECTRUM_TAPE_FLAGS_LENGTH_SHORT;/* Short edge;
+extern LIBSPECTRUM_API const int LIBSPECTRUM_TAPE_FLAGS_BLOCK;  /* End of block */
+extern LIBSPECTRUM_API const int LIBSPECTRUM_TAPE_FLAGS_STOP;	  /* Stop tape */
+extern LIBSPECTRUM_API const int LIBSPECTRUM_TAPE_FLAGS_STOP48; /* Stop tape if in 48K mode */
+extern LIBSPECTRUM_API const int LIBSPECTRUM_TAPE_FLAGS_NO_EDGE; /* Edge isn't really an edge */
+extern LIBSPECTRUM_API const int LIBSPECTRUM_TAPE_FLAGS_LEVEL_LOW; /* Set level low */
+extern LIBSPECTRUM_API const int LIBSPECTRUM_TAPE_FLAGS_LEVEL_HIGH; /* Set level high */
+extern LIBSPECTRUM_API const int LIBSPECTRUM_TAPE_FLAGS_LENGTH_SHORT;/* Short edge;
                                                 used for loader acceleration */
-extern WIN32_DLL const int LIBSPECTRUM_TAPE_FLAGS_LENGTH_LONG; /* Long edge;
+extern LIBSPECTRUM_API const int LIBSPECTRUM_TAPE_FLAGS_LENGTH_LONG; /* Long edge;
                                                 used for loader acceleration */
-extern WIN32_DLL const int LIBSPECTRUM_TAPE_FLAGS_TAPE;	/* Tape has finished */
+extern LIBSPECTRUM_API const int LIBSPECTRUM_TAPE_FLAGS_TAPE;	/* Tape has finished */
 
 /* The states which a block can be in */
 typedef enum libspectrum_tape_state_type {
@@ -661,28 +665,28 @@ typedef enum libspectrum_tape_state_type {
 } libspectrum_tape_state_type;
 
 /* Routines to manipulate tape blocks */
-WIN32_DLL libspectrum_tape_block*
+LIBSPECTRUM_API libspectrum_tape_block*
 libspectrum_tape_block_alloc( libspectrum_tape_type type );
-WIN32_DLL libspectrum_error
+LIBSPECTRUM_API libspectrum_error
 libspectrum_tape_block_free( libspectrum_tape_block *block );
-WIN32_DLL libspectrum_tape_type
+LIBSPECTRUM_API libspectrum_tape_type
 libspectrum_tape_block_type( libspectrum_tape_block *block );
-WIN32_DLL libspectrum_error
+LIBSPECTRUM_API libspectrum_error
 libspectrum_tape_block_set_type( libspectrum_tape_block *block,
 				 libspectrum_tape_type type );
 
-WIN32_DLL libspectrum_error
+LIBSPECTRUM_API libspectrum_error
 libspectrum_tape_block_init( libspectrum_tape_block *block,
                              libspectrum_tape_block_state *state );
 
-WIN32_DLL libspectrum_error
+LIBSPECTRUM_API libspectrum_error
 libspectrum_tape_block_description( char *buffer, size_t length,
 	                            libspectrum_tape_block *block );
 
-WIN32_DLL int
+LIBSPECTRUM_API int
 libspectrum_tape_block_metadata( libspectrum_tape_block *block );
 
-WIN32_DLL libspectrum_dword
+LIBSPECTRUM_API libspectrum_dword
 libspectrum_tape_block_length( libspectrum_tape_block *block );
 
 /* Accessor functions */
@@ -691,89 +695,89 @@ LIBSPECTRUM_TAPE_ACCESSORS
 /* A linked list of tape blocks */
 typedef struct libspectrum_tape libspectrum_tape;
 
-WIN32_DLL libspectrum_tape* libspectrum_tape_alloc( void );
-WIN32_DLL libspectrum_error libspectrum_tape_clear( libspectrum_tape *tape );
-WIN32_DLL libspectrum_error libspectrum_tape_free( libspectrum_tape *tape );
+LIBSPECTRUM_API libspectrum_tape* libspectrum_tape_alloc( void );
+LIBSPECTRUM_API libspectrum_error libspectrum_tape_clear( libspectrum_tape *tape );
+LIBSPECTRUM_API libspectrum_error libspectrum_tape_free( libspectrum_tape *tape );
 
 /* Read in a tape file, optionally guessing what sort of file it is */
-WIN32_DLL libspectrum_error
+LIBSPECTRUM_API libspectrum_error
 libspectrum_tape_read( libspectrum_tape *tape, const libspectrum_byte *buffer,
 		       size_t length, libspectrum_id_t type,
 		       const char *filename );
 
 /* Write a tape file */
-WIN32_DLL libspectrum_error
+LIBSPECTRUM_API libspectrum_error
 libspectrum_tape_write( libspectrum_byte **buffer, size_t *length,
 			libspectrum_tape *tape, libspectrum_id_t type );
 
 /* Does this tape structure actually contain a tape? */
-WIN32_DLL int libspectrum_tape_present( const libspectrum_tape *tape );
+LIBSPECTRUM_API int libspectrum_tape_present( const libspectrum_tape *tape );
 
-WIN32_DLL libspectrum_error
+LIBSPECTRUM_API libspectrum_error
 libspectrum_tape_get_next_edge( libspectrum_dword *tstates, int *flags,
 	                        libspectrum_tape *tape );
 
 /* Get the current block from the tape */
-WIN32_DLL libspectrum_tape_block *
+LIBSPECTRUM_API libspectrum_tape_block *
 libspectrum_tape_current_block( libspectrum_tape *tape );
 
 /* Get the state of the active block on the tape */
-WIN32_DLL libspectrum_tape_state_type
+LIBSPECTRUM_API libspectrum_tape_state_type
 libspectrum_tape_state( libspectrum_tape *tape );
 
 /* Set the state of the active block on the tape */
-WIN32_DLL libspectrum_error
+LIBSPECTRUM_API libspectrum_error
 libspectrum_tape_set_state( libspectrum_tape *tape,
                             libspectrum_tape_state_type state );
 
 /* Peek at the next block on the tape */
-WIN32_DLL libspectrum_tape_block *
+LIBSPECTRUM_API libspectrum_tape_block *
 libspectrum_tape_peek_next_block( libspectrum_tape *tape );
 
 /* Peek at the last block on the tape */
-WIN32_DLL libspectrum_tape_block *
+LIBSPECTRUM_API libspectrum_tape_block *
 libspectrum_tape_peek_last_block( libspectrum_tape *tape );
 
 /* Cause the next block on the tape to be active, initialise it
    and return it */
-WIN32_DLL libspectrum_tape_block *
+LIBSPECTRUM_API libspectrum_tape_block *
 libspectrum_tape_select_next_block( libspectrum_tape *tape );
 
 /* Get the position on the tape of the current block */
-WIN32_DLL libspectrum_error
+LIBSPECTRUM_API libspectrum_error
 libspectrum_tape_position( int *n, libspectrum_tape *tape );
 
 /* Select the nth block on the tape */
-WIN32_DLL libspectrum_error
+LIBSPECTRUM_API libspectrum_error
 libspectrum_tape_nth_block( libspectrum_tape *tape, int n );
 
 /* Append a block to the current tape */
-WIN32_DLL void
+LIBSPECTRUM_API void
 libspectrum_tape_append_block( libspectrum_tape *tape,
 			       libspectrum_tape_block *block );
 
-WIN32_DLL void
+LIBSPECTRUM_API void
 libspectrum_tape_remove_block( libspectrum_tape *tape,
 			       libspectrum_tape_iterator it );
 
-WIN32_DLL libspectrum_error
+LIBSPECTRUM_API libspectrum_error
 libspectrum_tape_insert_block( libspectrum_tape *tape,
 			       libspectrum_tape_block *block,
 			       size_t position );
 
 /*** Routines for iterating through a tape ***/
 
-WIN32_DLL libspectrum_tape_block *
+LIBSPECTRUM_API libspectrum_tape_block *
 libspectrum_tape_iterator_init( libspectrum_tape_iterator *iterator,
 				libspectrum_tape *tape );
 
-WIN32_DLL libspectrum_tape_block *
+LIBSPECTRUM_API libspectrum_tape_block *
 libspectrum_tape_iterator_current( libspectrum_tape_iterator iterator );
 
-WIN32_DLL libspectrum_tape_block *
+LIBSPECTRUM_API libspectrum_tape_block *
 libspectrum_tape_iterator_next( libspectrum_tape_iterator *iterator );
 
-WIN32_DLL libspectrum_tape_block *
+LIBSPECTRUM_API libspectrum_tape_block *
 libspectrum_tape_iterator_peek_next( libspectrum_tape_iterator iterator );
 
 /*** Routines for handling the TZX generalised data block symbol table
@@ -790,13 +794,13 @@ typedef enum libspectrum_tape_generalised_data_symbol_edge_type {
 
 typedef struct libspectrum_tape_generalised_data_symbol libspectrum_tape_generalised_data_symbol;
 
-WIN32_DLL libspectrum_dword libspectrum_tape_generalised_data_symbol_table_symbols_in_block( const libspectrum_tape_generalised_data_symbol_table *table );
-WIN32_DLL libspectrum_byte libspectrum_tape_generalised_data_symbol_table_max_pulses( const libspectrum_tape_generalised_data_symbol_table *table );
-WIN32_DLL libspectrum_word libspectrum_tape_generalised_data_symbol_table_symbols_in_table( const libspectrum_tape_generalised_data_symbol_table *table );
-WIN32_DLL libspectrum_tape_generalised_data_symbol* libspectrum_tape_generalised_data_symbol_table_symbol( const libspectrum_tape_generalised_data_symbol_table *table, size_t which );	
+LIBSPECTRUM_API libspectrum_dword libspectrum_tape_generalised_data_symbol_table_symbols_in_block( const libspectrum_tape_generalised_data_symbol_table *table );
+LIBSPECTRUM_API libspectrum_byte libspectrum_tape_generalised_data_symbol_table_max_pulses( const libspectrum_tape_generalised_data_symbol_table *table );
+LIBSPECTRUM_API libspectrum_word libspectrum_tape_generalised_data_symbol_table_symbols_in_table( const libspectrum_tape_generalised_data_symbol_table *table );
+LIBSPECTRUM_API libspectrum_tape_generalised_data_symbol* libspectrum_tape_generalised_data_symbol_table_symbol( const libspectrum_tape_generalised_data_symbol_table *table, size_t which );
 
-WIN32_DLL libspectrum_tape_generalised_data_symbol_edge_type libspectrum_tape_generalised_data_symbol_type( const libspectrum_tape_generalised_data_symbol *symbol );
-WIN32_DLL libspectrum_word libspectrum_tape_generalised_data_symbol_pulse( const libspectrum_tape_generalised_data_symbol *symbol, size_t which );
+LIBSPECTRUM_API libspectrum_tape_generalised_data_symbol_edge_type libspectrum_tape_generalised_data_symbol_type( const libspectrum_tape_generalised_data_symbol *symbol );
+LIBSPECTRUM_API libspectrum_word libspectrum_tape_generalised_data_symbol_pulse( const libspectrum_tape_generalised_data_symbol *symbol, size_t which );
 
 
 /*
@@ -805,40 +809,40 @@ WIN32_DLL libspectrum_word libspectrum_tape_generalised_data_symbol_pulse( const
 
 typedef struct libspectrum_rzx libspectrum_rzx;
 
-WIN32_DLL libspectrum_rzx* libspectrum_rzx_alloc( void );
-WIN32_DLL libspectrum_error libspectrum_rzx_free( libspectrum_rzx *rzx );
+LIBSPECTRUM_API libspectrum_rzx* libspectrum_rzx_alloc( void );
+LIBSPECTRUM_API libspectrum_error libspectrum_rzx_free( libspectrum_rzx *rzx );
 
-WIN32_DLL void
+LIBSPECTRUM_API void
 libspectrum_rzx_start_input( libspectrum_rzx *rzx, libspectrum_dword tstates );
-WIN32_DLL libspectrum_error
+LIBSPECTRUM_API libspectrum_error
 libspectrum_rzx_stop_input( libspectrum_rzx *rzx );
-WIN32_DLL libspectrum_error
+LIBSPECTRUM_API libspectrum_error
 libspectrum_rzx_add_snap( libspectrum_rzx *rzx, libspectrum_snap *snap, int automatic );
-WIN32_DLL libspectrum_error
+LIBSPECTRUM_API libspectrum_error
 libspectrum_rzx_rollback( libspectrum_rzx *rzx, libspectrum_snap **snap );
-WIN32_DLL libspectrum_error
+LIBSPECTRUM_API libspectrum_error
 libspectrum_rzx_rollback_to( libspectrum_rzx *rzx, libspectrum_snap **snap,
 			     size_t which );
 
-WIN32_DLL libspectrum_error
-libspectrum_rzx_store_frame( libspectrum_rzx *rzx, size_t instructions, 
+LIBSPECTRUM_API libspectrum_error
+libspectrum_rzx_store_frame( libspectrum_rzx *rzx, size_t instructions,
 			     size_t count, libspectrum_byte *in_bytes );
 
-WIN32_DLL libspectrum_error
+LIBSPECTRUM_API libspectrum_error
 libspectrum_rzx_start_playback( libspectrum_rzx *rzx, int which,
 				libspectrum_snap **snap );
-WIN32_DLL libspectrum_error
+LIBSPECTRUM_API libspectrum_error
 libspectrum_rzx_playback_frame( libspectrum_rzx *rzx, int *finished, libspectrum_snap **snap );
-WIN32_DLL libspectrum_error
+LIBSPECTRUM_API libspectrum_error
 libspectrum_rzx_playback( libspectrum_rzx *rzx, libspectrum_byte *byte );
 
 /* Get and set the tstate counter */
-WIN32_DLL size_t libspectrum_rzx_tstates( libspectrum_rzx *rzx );
+LIBSPECTRUM_API size_t libspectrum_rzx_tstates( libspectrum_rzx *rzx );
 
 /* Get the current frame's instruction count */
-WIN32_DLL size_t libspectrum_rzx_instructions( libspectrum_rzx *rzx );
+LIBSPECTRUM_API size_t libspectrum_rzx_instructions( libspectrum_rzx *rzx );
 
-WIN32_DLL libspectrum_dword libspectrum_rzx_get_keyid( libspectrum_rzx *rzx );
+LIBSPECTRUM_API libspectrum_dword libspectrum_rzx_get_keyid( libspectrum_rzx *rzx );
 
 typedef struct libspectrum_signature {
 
@@ -849,7 +853,7 @@ typedef struct libspectrum_signature {
 
 } libspectrum_signature;
 
-WIN32_DLL libspectrum_error
+LIBSPECTRUM_API libspectrum_error
 libspectrum_rzx_get_signature( libspectrum_rzx *rzx,
 			       libspectrum_signature *signature );
 
@@ -861,11 +865,11 @@ typedef struct libspectrum_rzx_dsa_key {
 
 } libspectrum_rzx_dsa_key;
 
-WIN32_DLL libspectrum_error
+LIBSPECTRUM_API libspectrum_error
 libspectrum_rzx_read( libspectrum_rzx *rzx, const libspectrum_byte *buffer,
 		      size_t length );
 
-WIN32_DLL libspectrum_error
+LIBSPECTRUM_API libspectrum_error
 libspectrum_rzx_write( libspectrum_byte **buffer, size_t *length,
 		       libspectrum_rzx *rzx, libspectrum_id_t snap_format,
 		       libspectrum_creator *creator, int compress,
@@ -888,31 +892,31 @@ typedef enum libspectrum_rzx_block_id {
 
 } libspectrum_rzx_block_id;
 
-WIN32_DLL void
+LIBSPECTRUM_API void
 libspectrum_rzx_insert_snap( libspectrum_rzx *rzx, libspectrum_snap *snap,
 			     int where );
 
-WIN32_DLL libspectrum_rzx_iterator
+LIBSPECTRUM_API libspectrum_rzx_iterator
 libspectrum_rzx_iterator_begin( libspectrum_rzx *rzx );
-WIN32_DLL libspectrum_rzx_iterator
+LIBSPECTRUM_API libspectrum_rzx_iterator
 libspectrum_rzx_iterator_next( libspectrum_rzx_iterator it );
-WIN32_DLL libspectrum_rzx_iterator
+LIBSPECTRUM_API libspectrum_rzx_iterator
 libspectrum_rzx_iterator_last( libspectrum_rzx *rzx );
 
-WIN32_DLL libspectrum_rzx_block_id
+LIBSPECTRUM_API libspectrum_rzx_block_id
 libspectrum_rzx_iterator_get_type( libspectrum_rzx_iterator it );
-WIN32_DLL size_t
+LIBSPECTRUM_API size_t
 libspectrum_rzx_iterator_get_frames( libspectrum_rzx_iterator it );
 
-WIN32_DLL void
+LIBSPECTRUM_API void
 libspectrum_rzx_iterator_delete( libspectrum_rzx *rzx,
 				 libspectrum_rzx_iterator it );
-WIN32_DLL libspectrum_snap*
+LIBSPECTRUM_API libspectrum_snap*
 libspectrum_rzx_iterator_get_snap( libspectrum_rzx_iterator it );
-WIN32_DLL int
+LIBSPECTRUM_API int
 libspectrum_rzx_iterator_snap_is_automatic( libspectrum_rzx_iterator it );
 
-WIN32_DLL libspectrum_error
+LIBSPECTRUM_API libspectrum_error
 libspectrum_rzx_finalise( libspectrum_rzx *rzx );
 
 /*
@@ -932,41 +936,41 @@ typedef struct libspectrum_microdrive libspectrum_microdrive;
 
 /* Constructor/destructor */
 
-WIN32_DLL libspectrum_microdrive*
+LIBSPECTRUM_API libspectrum_microdrive*
 libspectrum_microdrive_alloc( void );
-WIN32_DLL libspectrum_error
+LIBSPECTRUM_API libspectrum_error
 libspectrum_microdrive_free( libspectrum_microdrive *microdrive );
 
 /* Accessors */
 
-WIN32_DLL libspectrum_byte
+LIBSPECTRUM_API libspectrum_byte
 libspectrum_microdrive_data( const libspectrum_microdrive *microdrive,
 			     size_t which );
-WIN32_DLL void
+LIBSPECTRUM_API void
 libspectrum_microdrive_set_data( libspectrum_microdrive *microdrive,
 				 size_t which, libspectrum_byte data );
 
-WIN32_DLL int
+LIBSPECTRUM_API int
 libspectrum_microdrive_write_protect( const libspectrum_microdrive *microdrive );
-WIN32_DLL void
+LIBSPECTRUM_API void
 libspectrum_microdrive_set_write_protect( libspectrum_microdrive *microdrive,
 					  int write_protect );
 
-WIN32_DLL libspectrum_byte
+LIBSPECTRUM_API libspectrum_byte
 libspectrum_microdrive_cartridge_len( const libspectrum_microdrive *microdrive );
-WIN32_DLL void
+LIBSPECTRUM_API void
 libspectrum_microdrive_set_cartridge_len( libspectrum_microdrive *microdrive,
 					  libspectrum_byte len );
 
 /* .mdr format routines */
 
-WIN32_DLL int
+LIBSPECTRUM_API int
 libspectrum_microdrive_checksum( libspectrum_microdrive *microdrive,
 				 libspectrum_byte what );
-WIN32_DLL libspectrum_error
+LIBSPECTRUM_API libspectrum_error
 libspectrum_microdrive_mdr_read( libspectrum_microdrive *microdrive,
 				 libspectrum_byte *buffer, size_t length );
-WIN32_DLL void
+LIBSPECTRUM_API void
 libspectrum_microdrive_mdr_write( const libspectrum_microdrive *microdrive,
 				  libspectrum_byte **buffer, size_t *length );
 
@@ -979,7 +983,7 @@ typedef enum libspectrum_dck_bank {
   LIBSPECTRUM_DCK_BANK_DOCK = 0,
   LIBSPECTRUM_DCK_BANK_EXROM = 254,
   LIBSPECTRUM_DCK_BANK_HOME = 255
-} libspectrum_dck_bank; 
+} libspectrum_dck_bank;
 
 /* The type of one 8Kb page */
 typedef enum libspectrum_dck_page_type {
@@ -1002,17 +1006,17 @@ typedef struct libspectrum_dck {
   libspectrum_dck_block *dck[256];	/* dck block data */
 } libspectrum_dck;
 
-WIN32_DLL libspectrum_dck* libspectrum_dck_alloc( void );
-WIN32_DLL libspectrum_error
+LIBSPECTRUM_API libspectrum_dck* libspectrum_dck_alloc( void );
+LIBSPECTRUM_API libspectrum_error
 libspectrum_dck_free( libspectrum_dck *dck, int keep_pages );
 
 /* Read in a DCK file */
 
-WIN32_DLL libspectrum_error
+LIBSPECTRUM_API libspectrum_error
 libspectrum_dck_read( libspectrum_dck *dck, const libspectrum_byte *buffer,
                       size_t length );
 
-WIN32_DLL libspectrum_error
+LIBSPECTRUM_API libspectrum_error
 libspectrum_dck_read2( libspectrum_dck *dck, const libspectrum_byte *buffer,
                        size_t length, const char *filename );
 
@@ -1020,10 +1024,10 @@ libspectrum_dck_read2( libspectrum_dck *dck, const libspectrum_byte *buffer,
  * Crypto functions
  */
 
-WIN32_DLL libspectrum_error
+LIBSPECTRUM_API libspectrum_error
 libspectrum_verify_signature( libspectrum_signature *signature,
 			      libspectrum_rzx_dsa_key *key );
-WIN32_DLL libspectrum_error
+LIBSPECTRUM_API libspectrum_error
 libspectrum_signature_free( libspectrum_signature *signature );
 
 /*
@@ -1031,7 +1035,7 @@ libspectrum_signature_free( libspectrum_signature *signature );
  */
 
 typedef enum libspectrum_ide_databus {
-  
+
   LIBSPECTRUM_IDE_DATA8,
   LIBSPECTRUM_IDE_DATA16,
   LIBSPECTRUM_IDE_DATA16_BYTESWAP,
@@ -1040,7 +1044,7 @@ typedef enum libspectrum_ide_databus {
 } libspectrum_ide_databus;
 
 typedef enum libspectrum_ide_unit {
-  
+
   LIBSPECTRUM_IDE_MASTER = 0,
   LIBSPECTRUM_IDE_SLAVE = 1,
 
@@ -1062,33 +1066,33 @@ typedef enum libspectrum_ide_register {
 
 typedef struct libspectrum_ide_channel libspectrum_ide_channel;
 
-WIN32_DLL libspectrum_ide_channel*
+LIBSPECTRUM_API libspectrum_ide_channel*
 libspectrum_ide_alloc( libspectrum_ide_databus databus );
-WIN32_DLL libspectrum_error
+LIBSPECTRUM_API libspectrum_error
 libspectrum_ide_free( libspectrum_ide_channel *chn );
 
-WIN32_DLL libspectrum_error
+LIBSPECTRUM_API libspectrum_error
 libspectrum_ide_insert( libspectrum_ide_channel *chn,
                         libspectrum_ide_unit unit,
                         const char *filename );
-WIN32_DLL libspectrum_error
+LIBSPECTRUM_API libspectrum_error
 libspectrum_ide_commit( libspectrum_ide_channel *chn,
 			libspectrum_ide_unit unit );
-WIN32_DLL int
+LIBSPECTRUM_API int
 libspectrum_ide_dirty( libspectrum_ide_channel *chn,
 		       libspectrum_ide_unit unit );
-WIN32_DLL libspectrum_error
+LIBSPECTRUM_API libspectrum_error
 libspectrum_ide_eject( libspectrum_ide_channel *chn,
 		       libspectrum_ide_unit unit );
 
-WIN32_DLL libspectrum_error
+LIBSPECTRUM_API libspectrum_error
 libspectrum_ide_reset( libspectrum_ide_channel *chn );
 
-WIN32_DLL libspectrum_byte
+LIBSPECTRUM_API libspectrum_byte
 libspectrum_ide_read( libspectrum_ide_channel *chn,
 		      libspectrum_ide_register reg );
 
-WIN32_DLL void
+LIBSPECTRUM_API void
 libspectrum_ide_write( libspectrum_ide_channel *chn,
 		       libspectrum_ide_register reg,
 		       libspectrum_byte data );
@@ -1097,31 +1101,31 @@ libspectrum_ide_write( libspectrum_ide_channel *chn,
 
 typedef struct libspectrum_mmc_card libspectrum_mmc_card;
 
-WIN32_DLL libspectrum_mmc_card*
+LIBSPECTRUM_API libspectrum_mmc_card*
 libspectrum_mmc_alloc( void );
 
-WIN32_DLL void
+LIBSPECTRUM_API void
 libspectrum_mmc_free( libspectrum_mmc_card *card );
 
-WIN32_DLL libspectrum_error
+LIBSPECTRUM_API libspectrum_error
 libspectrum_mmc_insert( libspectrum_mmc_card *card, const char *filename );
 
-WIN32_DLL void
+LIBSPECTRUM_API void
 libspectrum_mmc_eject( libspectrum_mmc_card *card );
 
-WIN32_DLL void
+LIBSPECTRUM_API void
 libspectrum_mmc_reset( libspectrum_mmc_card *card );
 
-WIN32_DLL int
+LIBSPECTRUM_API int
 libspectrum_mmc_dirty( libspectrum_mmc_card *card );
 
-WIN32_DLL void
+LIBSPECTRUM_API void
 libspectrum_mmc_commit( libspectrum_mmc_card *card );
 
-WIN32_DLL libspectrum_byte
+LIBSPECTRUM_API libspectrum_byte
 libspectrum_mmc_read( libspectrum_mmc_card *card );
 
-WIN32_DLL void
+LIBSPECTRUM_API void
 libspectrum_mmc_write( libspectrum_mmc_card *card, libspectrum_byte data );
 
 #ifdef __cplusplus
diff --git a/make-perl.c b/make-perl.c
index ea2f694..e539ca2 100644
--- a/make-perl.c
+++ b/make-perl.c
@@ -155,47 +155,61 @@ int main(void)
 "typedef void           (*GFreeFunc)            (gpointer       data);\n"
 "\n"
 "\n"
-"WIN32_DLL GSList *g_slist_insert_sorted	(GSList		*list,\n"
-"						 gpointer	 data,\n"
-"						 GCompareFunc	 func);\n"
+"LIBSPECTRUM_API\n"
+"GSList *g_slist_insert_sorted	(GSList		*list,\n"
+"				 gpointer	 data,\n"
+"				 GCompareFunc	 func);\n"
 "\n"
-"WIN32_DLL GSList *g_slist_insert		(GSList		*list,\n"
-"			 			 gpointer	 data,\n"
-"			 			 gint		 position);\n"
+"LIBSPECTRUM_API\n"
+"GSList *g_slist_insert		(GSList		*list,\n"
+"	 			 gpointer	 data,\n"
+"	 			 gint		 position);\n"
 "\n"
-"WIN32_DLL GSList *g_slist_append		(GSList		*list,\n"
-"						 gpointer	 data);\n"
+"LIBSPECTRUM_API\n"
+"GSList *g_slist_append		(GSList		*list,\n"
+"				 gpointer	 data);\n"
 "\n"
-"WIN32_DLL GSList *g_slist_prepend		(GSList		*list,\n"
-"						 gpointer	 data);\n"
+"LIBSPECTRUM_API\n"
+"GSList *g_slist_prepend 	(GSList		*list,\n"
+"				 gpointer	 data);\n"
 "\n"
-"WIN32_DLL GSList *g_slist_remove		(GSList		*list,\n"
-"						 gconstpointer	 data);\n"
+"LIBSPECTRUM_API\n"
+"GSList *g_slist_remove		(GSList		*list,\n"
+"				 gconstpointer	 data);\n"
 "\n"
-"WIN32_DLL GSList *g_slist_last			(GSList		*list);\n"
+"LIBSPECTRUM_API\n"
+"GSList *g_slist_last		(GSList		*list);\n"
 "\n"
-"WIN32_DLL GSList *g_slist_reverse		(GSList		*list);\n"
+"LIBSPECTRUM_API\n"
+"GSList *g_slist_reverse 	(GSList		*list);\n"
 "\n"
-"WIN32_DLL GSList *g_slist_delete_link		(GSList		*list,\n"
-"				 		 GSList		*link);\n"
+"LIBSPECTRUM_API\n"
+"GSList *g_slist_delete_link	(GSList		*list,\n"
+"				 GSList		*link);\n"
 "\n"
-"WIN32_DLL guint	g_slist_length		(GSList *list);\n"
+"LIBSPECTRUM_API\n"
+"guint	g_slist_length		(GSList *list);\n"
 "\n"
-"WIN32_DLL void	g_slist_foreach			(GSList		*list,\n"
-"						 GFunc		 func,\n"
-"						 gpointer	 user_data);\n"
+"LIBSPECTRUM_API\n"
+"void	g_slist_foreach		(GSList		*list,\n"
+"				 GFunc		 func,\n"
+"				 gpointer	 user_data);\n"
 "\n"
-"WIN32_DLL void	g_slist_free			(GSList		*list);\n"
+"LIBSPECTRUM_API\n"
+"void	g_slist_free		(GSList		*list);\n"
 "\n"
-"WIN32_DLL GSList *g_slist_nth		(GSList		*list,\n"
-"					 guint		n);\n"
+"LIBSPECTRUM_API\n"
+"GSList *g_slist_nth		(GSList		*list,\n"
+"				 guint		n);\n"
 "\n"
-"WIN32_DLL GSList *g_slist_find_custom	(GSList		*list,\n"
-"					 gconstpointer	data,\n"
-"					 GCompareFunc	func );\n"
+"LIBSPECTRUM_API\n"
+"GSList *g_slist_find_custom	(GSList		*list,\n"
+"				 gconstpointer	data,\n"
+"				 GCompareFunc	func );\n"
 "\n"
-"WIN32_DLL gint	g_slist_position	(GSList		*list,\n"
-"					 GSList		*llink);\n"
+"LIBSPECTRUM_API\n"
+"gint	g_slist_position	(GSList		*list,\n"
+"				 GSList		*llink);\n"
 "\n"
 "typedef struct _GHashTable	GHashTable;\n"
 "\n"
@@ -209,40 +223,52 @@ int main(void)
 "						 gpointer	value,\n"
 "						 gpointer	user_data);\n"
 "\n"
-"WIN32_DLL gint	g_int_equal (gconstpointer   v,\n"
-"			       gconstpointer   v2);\n"
-"WIN32_DLL guint	g_int_hash  (gconstpointer   v);\n"
-"\n"
-"WIN32_DLL gint	g_str_equal (gconstpointer   v,\n"
-"			       gconstpointer   v2);\n"
-"WIN32_DLL guint	g_str_hash  (gconstpointer   v);\n"
-"\n"
-"WIN32_DLL GHashTable *g_hash_table_new	(GHashFunc	 hash_func,\n"
-"					 GCompareFunc	 key_compare_func);\n"
-"\n"
-"WIN32_DLL GHashTable *g_hash_table_new_full (GHashFunc       hash_func,\n"
-"                                             GCompareFunc    key_equal_func,\n"
-"                                             GDestroyNotify  key_destroy_func,\n"
-"                                             GDestroyNotify  value_destroy_func);\n"
-"\n"
-"WIN32_DLL void	g_hash_table_destroy	(GHashTable	*hash_table);\n"
-"\n"
-"WIN32_DLL void	g_hash_table_insert	(GHashTable	*hash_table,\n"
-"					 gpointer	 key,\n"
-"					 gpointer	 value);\n"
-"\n"
-"WIN32_DLL gpointer g_hash_table_lookup	(GHashTable	*hash_table,\n"
-"					 gconstpointer	 key);\n"
-"\n"
-"WIN32_DLL void	g_hash_table_foreach (GHashTable	*hash_table,\n"
-"						 GHFunc    func,\n"
-"						 gpointer  user_data);\n"
-"\n"
-"WIN32_DLL guint	g_hash_table_foreach_remove	(GHashTable	*hash_table,\n"
-"						 GHRFunc	 func,\n"
-"						 gpointer	 user_data);\n"
-"\n"
-"WIN32_DLL guint	g_hash_table_size (GHashTable	*hash_table);\n"
+"LIBSPECTRUM_API\n"
+"gint	g_int_equal	(gconstpointer   v,\n"
+"			 gconstpointer   v2);\n"
+"LIBSPECTRUM_API\n"
+"guint	g_int_hash	(gconstpointer   v);\n"
+"\n"
+"LIBSPECTRUM_API\n"
+"gint	g_str_equal	(gconstpointer   v,\n"
+"			 gconstpointer	 v2);\n"
+"LIBSPECTRUM_API\n"
+"guint	g_str_hash	(gconstpointer   v);\n"
+"\n"
+"LIBSPECTRUM_API\n"
+"GHashTable *g_hash_table_new	(GHashFunc	 hash_func,\n"
+"				 GCompareFunc	 key_compare_func);\n"
+"\n"
+"LIBSPECTRUM_API\n"
+"GHashTable *g_hash_table_new_full (GHashFunc       hash_func,\n"
+"				    GCompareFunc    key_equal_func,\n"
+"				    GDestroyNotify  key_destroy_func,\n"
+"				    GDestroyNotify  value_destroy_func);\n"
+"\n"
+"LIBSPECTRUM_API\n"
+"void	g_hash_table_destroy	(GHashTable	*hash_table);\n"
+"\n"
+"LIBSPECTRUM_API\n"
+"void	g_hash_table_insert	(GHashTable	*hash_table,\n"
+"				 gpointer	 key,\n"
+"				 gpointer	 value);\n"
+"\n"
+"LIBSPECTRUM_API\n"
+"gpointer g_hash_table_lookup	(GHashTable	*hash_table,\n"
+"				 gconstpointer	 key);\n"
+"\n"
+"LIBSPECTRUM_API\n"
+"void	g_hash_table_foreach	(GHashTable	*hash_table,\n"
+"				 GHFunc    func,\n"
+"				 gpointer  user_data);\n"
+"\n"
+"LIBSPECTRUM_API\n"
+"guint	g_hash_table_foreach_remove	(GHashTable	*hash_table,\n"
+"					 GHRFunc	 func,\n"
+"					 gpointer	 user_data);\n"
+"\n"
+"LIBSPECTRUM_API\n"
+"guint	g_hash_table_size (GHashTable	*hash_table);\n"
 "\n"
 "typedef struct _GArray GArray;\n"
 "\n"
@@ -256,16 +282,16 @@ int main(void)
 "  guint allocated;\n"
 "};\n"
 "\n"
-"WIN32_DLL GArray* g_array_new( gboolean zero_terminated, gboolean clear,\n"
+"LIBSPECTRUM_API GArray* g_array_new( gboolean zero_terminated, gboolean clear,\n"
 "		      guint element_size );\n"
-"WIN32_DLL GArray* g_array_sized_new( gboolean zero_terminated, gboolean clear,\n"
+"LIBSPECTRUM_API GArray* g_array_sized_new( gboolean zero_terminated, gboolean clear,\n"
 "                   guint element_size, guint reserved_size );\n"
 "#define g_array_append_val(a,v) g_array_append_vals( a, &(v), 1 );\n"
-"WIN32_DLL GArray* g_array_append_vals( GArray *array, gconstpointer data, guint len );\n"
+"LIBSPECTRUM_API GArray* g_array_append_vals( GArray *array, gconstpointer data, guint len );\n"
 "#define g_array_index(a,t,i) (*(((t*)a->data)+i))\n"
-"WIN32_DLL GArray* g_array_set_size( GArray *array, guint length );\n"
-"WIN32_DLL GArray* g_array_remove_index_fast( GArray *array, guint index );\n"
-"WIN32_DLL gchar* g_array_free( GArray *array, gboolean free_segment );\n"
+"LIBSPECTRUM_API GArray* g_array_set_size( GArray *array, guint length );\n"
+"LIBSPECTRUM_API GArray* g_array_remove_index_fast( GArray *array, guint index );\n"
+"LIBSPECTRUM_API gchar* g_array_free( GArray *array, gboolean free_segment );\n"
 "\n" );
   if( sizeof( void* ) == sizeof( int ) ) {
     printf( "#define GINT_TO_POINTER(i)      ((gpointer)  (i))\n" );
@@ -324,10 +350,10 @@ int main(void)
   printf( "\n/* we support snapshots etc. requiring zlib (e.g. compressed szx) */\n" );
   printf( "#define	LIBSPECTRUM_SUPPORTS_ZLIB_COMPRESSION	(1)\n\n" );
   printf( "/* zlib (de)compression routines */\n\n" );
-  printf( "WIN32_DLL libspectrum_error\n" );
+  printf( "LIBSPECTRUM_API libspectrum_error\n" );
   printf( "libspectrum_zlib_inflate( const libspectrum_byte *gzptr, size_t gzlength,\n" );
   printf( "			  libspectrum_byte **outptr, size_t *outlength );\n\n" );
-  printf( "WIN32_DLL libspectrum_error\n" );
+  printf( "LIBSPECTRUM_API libspectrum_error\n" );
   printf( "libspectrum_zlib_compress( const libspectrum_byte *data, size_t length,\n" );
   printf( "			   libspectrum_byte **gzptr, size_t *gzlength );\n\n" );
 
diff --git a/tape.c b/tape.c
index 94ee726..b3776f1 100644
--- a/tape.c
+++ b/tape.c
@@ -1250,7 +1250,7 @@ libspectrum_tape_peek_next_block( libspectrum_tape *tape )
 }
 
 /* Peek at the last block on the tape */
-libspectrum_tape_block WIN32_DLL *
+libspectrum_tape_block LIBSPECTRUM_API *
 libspectrum_tape_peek_last_block( libspectrum_tape *tape )
 {
   return tape->last_block ? tape->last_block->data : NULL;

[fuse-emulator-cvs] [libspectrum] branch master updated: Fix a compilation warning in test 72

[<fr...@us...>]

This is an automated email from the git hooks/post-receive-user script.

fredm pushed a commit to branch master
in repository libspectrum.

View the commit online:
https://sourceforge.net/p/fuse-emulator/libspectrum/ci/091a35cae0218e267e31a541fdb1f92601311c6c/

The following commit(s) were added to refs/heads/master by this push:
     new 091a35c  Fix a compilation warning in test 72
091a35c is described below

commit 091a35cae0218e267e31a541fdb1f92601311c6c
Author: Fredrick Meunier <fr...@sp...>
AuthorDate: Sat Mar 6 16:08:45 2021 +1100

    Fix a compilation warning in test 72
---
 test/test.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/test/test.c b/test/test.c
index e9a1bde..363e30c 100644
--- a/test/test.c
+++ b/test/test.c
@@ -824,7 +824,6 @@ test_72( void )
   size_t filesize = 0;
   libspectrum_tape *tape;
   libspectrum_tape_iterator it;
-  libspectrum_tape_block *block;
   libspectrum_tape_type expected_next_block_types[19] = {
     LIBSPECTRUM_TAPE_BLOCK_TURBO,       /* ROM */
     LIBSPECTRUM_TAPE_BLOCK_PURE_TONE,   /* Turbo */
@@ -867,7 +866,7 @@ test_72( void )
 
   libspectrum_free( buffer );
 
-  block = libspectrum_tape_iterator_init( &it, tape );
+  libspectrum_tape_iterator_init( &it, tape );
 
   while( libspectrum_tape_iterator_peek_next( it ) )
   {
@@ -880,7 +879,7 @@ test_72( void )
       break;
     }
 
-    block = libspectrum_tape_iterator_next( &it );
+    libspectrum_tape_iterator_next( &it );
     next_block_type++;
     blocks_processed++;
   }

[fuse-emulator-cvs] [libspectrum] branch master updated: Run tests with 'make check'

[<fr...@us...>]

This is an automated email from the git hooks/post-receive-user script.

fredm pushed a commit to branch master
in repository libspectrum.

View the commit online:
https://sourceforge.net/p/fuse-emulator/libspectrum/ci/238334fbf2af3147592400390f1696822f6ae68a/

The following commit(s) were added to refs/heads/master by this push:
     new 238334f  Run tests with 'make check'
238334f is described below

commit 238334fbf2af3147592400390f1696822f6ae68a
Author: Alberto Garcia <be...@ig...>
AuthorDate: Sat Mar 6 16:07:33 2021 +1100

    Run tests with 'make check'
---
 .gitignore       | 4 ++++
 ChangeLog        | 1 +
 test/Makefile.am | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/.gitignore b/.gitignore
index 3fb44d8..1cf7a60 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,7 +48,11 @@ cscope.out
 /tags
 /tape_accessors.c
 /tape_set.c
+/test-driver
+/test-suite.log
 /test/complete-tzx.tzx
 /test/test
 /test/test.exe
+/test/test.log
+/test/test.trs
 .vscode
diff --git a/ChangeLog b/ChangeLog
index 8bca7d7..1f00adc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
         * Various minor bug fixes/improvements:
           * Fix PZX handling on big endian systems (Alberto Garcia).
+          * Run tests on 'make check' invocation (Alberto Garcia).
 
 2021-02-27  Philip Kendall  <phi...@sh...>
 
diff --git a/test/Makefile.am b/test/Makefile.am
index b1e5c13..fa9b9be 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -21,6 +21,8 @@
 
 check_PROGRAMS = test/test
 
+TESTS = $(check_PROGRAMS)
+
 test_test_SOURCES = \
 	test/edges.c \
 	test/szx.c \

[fuse-emulator-cvs] [libspectrum] branch master updated: Correct PZX handling on big-endian machines

[<fr...@us...>]

This is an automated email from the git hooks/post-receive-user script.

fredm pushed a commit to branch master
in repository libspectrum.

View the commit online:
https://sourceforge.net/p/fuse-emulator/libspectrum/ci/91f0567ba7e0608e4c4a3ecaf65d053dc8bc487a/

The following commit(s) were added to refs/heads/master by this push:
     new 91f0567  Correct PZX handling on big-endian machines
91f0567 is described below

commit 91f0567ba7e0608e4c4a3ecaf65d053dc8bc487a
Author: Alberto Garcia <be...@ig...>
AuthorDate: Sat Mar 6 15:55:26 2021 +1100

    Correct PZX handling on big-endian machines
---
 ChangeLog  |  5 +++++
 pzx_read.c | 21 +++++++++++++++------
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7f662dc..8bca7d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2021-??-??  Philip Kendall  <phi...@sh...>
+
+        * Various minor bug fixes/improvements:
+          * Fix PZX handling on big endian systems (Alberto Garcia).
+
 2021-02-27  Philip Kendall  <phi...@sh...>
 
         * libspectrum 1.5.0 released.
diff --git a/pzx_read.c b/pzx_read.c
index b756763..b37e13d 100644
--- a/pzx_read.c
+++ b/pzx_read.c
@@ -92,7 +92,7 @@ typedef libspectrum_error (*read_block_fn)( libspectrum_tape *tape,
 
 static libspectrum_error
 pzx_read_data( const libspectrum_byte **ptr, const libspectrum_byte *end,
-	       size_t length, libspectrum_byte **data );
+	       int count, size_t width, libspectrum_byte **data );
 
 static libspectrum_error
 pzx_read_string( const libspectrum_byte **ptr, const libspectrum_byte *end,
@@ -271,17 +271,17 @@ read_data_block( libspectrum_tape *tape, const libspectrum_byte **buffer,
   }
 
   error = pzx_read_data( buffer, block_end,
-                         p0_count * sizeof( libspectrum_word ),
+                         p0_count, sizeof( libspectrum_word ),
                          (libspectrum_byte**)&p0_pulses );
   if( error ) return error;
 
   error = pzx_read_data( buffer, block_end,
-                         p1_count * sizeof( libspectrum_word ),
+                         p1_count, sizeof( libspectrum_word ),
                          (libspectrum_byte**)&p1_pulses );
   if( error ) { libspectrum_free( p0_pulses ); return error; }
 
   /* And the actual data */
-  error = pzx_read_data( buffer, block_end, count_bytes, &data );
+  error = pzx_read_data( buffer, block_end, count_bytes, 1, &data );
   if( error ) {
     libspectrum_free( p0_pulses );
     libspectrum_free( p1_pulses );
@@ -612,8 +612,9 @@ internal_pzx_read( libspectrum_tape *tape, const libspectrum_byte *buffer,
 
 static libspectrum_error
 pzx_read_data( const libspectrum_byte **ptr, const libspectrum_byte *end,
-	       size_t length, libspectrum_byte **data )
+	       int count, size_t width, libspectrum_byte **data )
 {
+  size_t length = count * width;
   /* Have we got enough bytes left in buffer? */
   if( ( end - (*ptr) ) < (ptrdiff_t)(length) ) {
     libspectrum_print_error( LIBSPECTRUM_ERROR_CORRUPT,
@@ -626,7 +627,15 @@ pzx_read_data( const libspectrum_byte **ptr, const libspectrum_byte *end,
   if( length ) {
     *data = libspectrum_new( libspectrum_byte, length );
     /* Copy the block data across, and move along */
-    memcpy( *data, *ptr, length ); *ptr += length;
+    if( width == sizeof( libspectrum_word ) ) {
+      int i;
+      libspectrum_word *dst = (libspectrum_word *) *data;
+      for( i = 0; i < count; i++ ) {
+        dst[i] = libspectrum_read_word( ptr );
+      }
+    } else {
+      memcpy( *data, *ptr, length ); *ptr += length;
+    }
   } else {
     *data = NULL;
   }

[fuse-emulator-cvs] [fuse] annotated tag fuse-1.6.0 created (now cf3d5ddc)

[<fr...@us...>]

This is an automated email from the git hooks/post-receive-user script.

fredm pushed a change to annotated tag fuse-1.6.0
in repository fuse.

      at cf3d5ddc (tag)
 tagging b2f1ea6cb63eb2849d2c9e138313aa425808be98 (commit)
 replaces fuse-1.5.7
      by Fredrick Meunier
      on Sun Feb 28 21:33:00 2021 +1100

- Log -----------------------------------------------------------------
Tag Fuse 1.6.0
-----------------------------------------------------------------------

No new revisions were added by this update.

[fuse-emulator-cvs] [libspectrum] annotated tag libspectrum-1.5.0 created (now cac994c)

[<fr...@us...>]

This is an automated email from the git hooks/post-receive-user script.

fredm pushed a change to annotated tag libspectrum-1.5.0
in repository libspectrum.

      at cac994c  (tag)
 tagging f982a143c239497cc7ad7da4a805aa2ab7855970 (commit)
 replaces libspectrum-1.4.4
      by Fredrick Meunier
      on Sun Feb 28 21:31:57 2021 +1100

- Log -----------------------------------------------------------------
Tag libspectrum 1.5.0
-----------------------------------------------------------------------

No new revisions were added by this update.

[fuse-emulator-cvs] [website] branch master updated: Update Fedora info and tidy up ChangeLog

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

This is an automated email from the git hooks/post-receive-user script.

sbaldovi pushed a commit to branch master
in repository website.

View the commit online:
https://sourceforge.net/p/fuse-emulator/website/ci/99bc769576084042e373ac77237bc1812f8edf85/

The following commit(s) were added to refs/heads/master by this push:
     new 99bc769  Update Fedora info and tidy up ChangeLog
99bc769 is described below

commit 99bc769576084042e373ac77237bc1812f8edf85
Author: Sergio Baldoví <ser...@gm...>
AuthorDate: Sun Feb 28 12:47:18 2021 +0100

    Update Fedora info and tidy up ChangeLog
---
 fuse.php        | 5 ++---
 libspectrum.php | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/fuse.php b/fuse.php
index dcc3101..199de58 100644
--- a/fuse.php
+++ b/fuse.php
@@ -86,7 +86,7 @@ fuse_section ("Download", "Downloads", <<<END_SECTION
    <li>The most recent version of Fuse is always available on <a href="https://flathub.org/apps/details/net.sf.fuse_emulator/">Flathub</a> for Linux users.</li>
    <li><a href="https://www.archlinux.org/">Arch Linux</a> users can get version 1.5.7 from AUR as a <a href="https://aur.archlinux.org/packages/fuse-emulator/">PKGBUILD</a>.</li>
    <li><a href="http://packages.debian.org/search?keywords=fuse-emulator">Official packages</a> of 1.5.7 for <a href="http://www.debian.org/">Debian</a>, maintained by Alberto Garcia, are available.</li>
-   <li><a href="http://fedoraproject.org/">Fedora</a> has <a href="https://apps.fedoraproject.org/packages/fuse-emulator/">packages</a> of 1.5.4 available by Lucian Langa.</li>
+   <li><a href="https://getfedora.org/">Fedora</a> has <a href="https://src.fedoraproject.org/rpms/fuse-emulator/">packages</a> of 1.5.7 available by Lucian Langa.</li>
    <li><a href="http://www.freebsd.org/">FreeBSD</a> has a port of 1.5.7 available as <a href="http://svnweb.freebsd.org/ports/head/emulators/fuse/">emulators/fuse</a>.</li>
    <li><a href="https://www.gentoo.org/">Gentoo</a> users have an <a href="https://packages.gentoo.org/packages/app-emulation/fuse">ebuild</a> of 1.5.7 available.</li>
    <li><a href="http://www.netbsd.org/">NetBSD</a> users can get version 1.5.7 from <a href="http://www.pkgsrc.org/">pkgsrc</a> (the NetBSD Packages Collection) as <a href="http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/emulators/fuse-emulator/">emulators/fuse-emulator</a> and <a href="http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/emulators/fuse-emulator-utils/">emulators/fuse-emulator-utils</a>.</li>
@@ -210,11 +210,10 @@ fuse_section (NULL, "What's new?", <<<END_SECTION
     <li>GTK 3: Fix bug when resizing from 2x to 3x</li>
     <li>SDL: Fix crash when using dispmanx backend on the Raspberry Pi</li>
     <li>SDL: Allow forcing fullscreen mode when SDL doesn't report available screen modes</li>
-    <li>WidgetUI: New dialog to load/save binary data (Gergely Szasz).</li>
+    <li>WidgetUI: New dialog to load/save binary data</li>
     <li>WidgetUI: Enable HOME and END keys in menus</li>
     <li>WidgetUI: Use monospaced characters on memory browser</li>
     <li>WidgetUI: Fix crash when trying to overwrite read-only files</li>
-    <li>Win32: Fix bitwise operation in debugger</li>
     <li>Xlib: Try to keep graphic filter when the user resize the window</li>
     <li>Fix display corruption with HQ 3x scaler</li>
     <li>Fix antialiasing effect of AdvMAME3x scaler</li>
diff --git a/libspectrum.php b/libspectrum.php
index 043339c..30b9574 100644
--- a/libspectrum.php
+++ b/libspectrum.php
@@ -89,7 +89,7 @@ fuse_section ("Download", "Downloads", <<<END_SECTION
   <ul>
    <li><a href="https://www.archlinux.org/">Arch Linux</a> has 1.4.4 available from the <a href="https://aur.archlinux.org/packages/libspectrum/">Arch User Repository</a>.</li>
    <li><a href="http://packages.debian.org/search?keywords=libspectrum">Official packages</a> of 1.4.4 for <a href="http://www.debian.org/">Debian</a>, maintained by Alberto Garcia, are available.</li>
-   <li><a href="https://apps.fedoraproject.org/packages/libspectrum">Fedora</a> (1.4.3)</li>
+   <li><a href="https://src.fedoraproject.org/rpms/libspectrum">Fedora</a> (1.4.4)</li>
    <li><a href="http://svnweb.freebsd.org/ports/head/emulators/libspectrum/">FreeBSD</a> (1.4.4)</li>
    <li><a href="https://packages.gentoo.org/packages/app-emulation/libspectrum">Gentoo</a> (1.4.4)</li>
    <li><a href="http://www.netbsd.org/">NetBSD</a> has 1.4.4 available as <a href="http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/emulators/libspectrum/">emulators/libspectrum</a> in <a href="http://www.pkgsrc.org/">pkgsrc</a>.</li>

[fuse-emulator-cvs] [website] branch master updated: Update website for 1.6.0 release

[<fr...@us...>]

This is an automated email from the git hooks/post-receive-user script.

fredm pushed a commit to branch master
in repository website.

View the commit online:
https://sourceforge.net/p/fuse-emulator/website/ci/4291d20f90f2074dad4b64b5b78e895d7fe9de08/

The following commit(s) were added to refs/heads/master by this push:
     new 4291d20  Update website for 1.6.0 release
4291d20 is described below

commit 4291d20f90f2074dad4b64b5b78e895d7fe9de08
Author: Fredrick Meunier <fr...@sp...>
AuthorDate: Sun Feb 28 21:23:54 2021 +1100

    Update website for 1.6.0 release
---
 fuse.php        | 55 +++++++++++++++++++++++++++++++++++++++++--------------
 libspectrum.php | 24 ++++++++++++------------
 2 files changed, 53 insertions(+), 26 deletions(-)

diff --git a/fuse.php b/fuse.php
index a258125..dcc3101 100644
--- a/fuse.php
+++ b/fuse.php
@@ -1,7 +1,7 @@
 <?php
 
 /* fuse.php: the main Fuse homepage
-   Copyright (c) 1999-2018 Darren Salt, Philip Kendall
+   Copyright (c) 1999-2021 Darren Salt, Philip Kendall
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -48,7 +48,7 @@ fuse_section ("Features", "What features does it have?", <<<END_SECTION
    <li>Working +3e, SE, TC2048, TC2068, TS2068, Pentagon 128, Pentagon "512" (Pentagon 128 modified for extra memory), Pentagon 1024 and Scorpion ZS 256 emulation.</li>
    <li>Runs at true Speccy speed on any computer you're likely to try it on.</li>
    <li>Support for loading from .tzx files, including accelerated loading.</li>
-   <li>Sound (on Windows and Mac OS X, and on systems supporting ALSA, the Open Sound System, SDL or OpenBSD/Solaris's <tt>/dev/audio</tt>).</li>
+   <li>Sound (on Windows and Mac OS X, and on systems supporting ALSA, the Open Sound System, SDL, PulseAudio or OpenBSD/Solaris's <tt>/dev/audio</tt>).</li>
    <li>Kempston joystick emulation.</li>
    <li>Emulation of the various printers you could attach to the Spectrum.</li>
    <li>Support for the RZX input recording file format, including 'competition mode'.</li>
@@ -56,6 +56,7 @@ fuse_section ("Features", "What features does it have?", <<<END_SECTION
    <li>Emulation of the Covox, Fuller audio box, Melodik and SpecDrum audio interfaces.</li>
    <li>Emulation of the Beta 128, +D, Didaktik 80/40, DISCiPLE and Opus Discovery disk interfaces.</li>
    <li>Emulation of the Spectranet and SpeccyBoot network interfaces.</li>
+   <li>Emulation of the TTX2000S teletext interface.</li>
    <li>Support for the Recreated ZX Spectrum Bluetooth keyboard.</li>
   </ul>
 
@@ -83,17 +84,17 @@ fuse_section ("Download", "Downloads", <<<END_SECTION
   <p>Packages are available for some Unix distributions; in general, any problems which are specific to the packages should be sent to the package maintainer.</p>
   <ul>
    <li>The most recent version of Fuse is always available on <a href="https://flathub.org/apps/details/net.sf.fuse_emulator/">Flathub</a> for Linux users.</li>
-   <li><a href="https://www.archlinux.org/">Arch Linux</a> users can get version 1.5.6 from AUR as a <a href="https://aur.archlinux.org/packages/fuse-emulator/">PKGBUILD</a>.</li>
-   <li><a href="http://packages.debian.org/search?keywords=fuse-emulator">Official packages</a> of 1.5.6 for <a href="http://www.debian.org/">Debian</a>, maintained by Alberto Garcia, are available.</li>
+   <li><a href="https://www.archlinux.org/">Arch Linux</a> users can get version 1.5.7 from AUR as a <a href="https://aur.archlinux.org/packages/fuse-emulator/">PKGBUILD</a>.</li>
+   <li><a href="http://packages.debian.org/search?keywords=fuse-emulator">Official packages</a> of 1.5.7 for <a href="http://www.debian.org/">Debian</a>, maintained by Alberto Garcia, are available.</li>
    <li><a href="http://fedoraproject.org/">Fedora</a> has <a href="https://apps.fedoraproject.org/packages/fuse-emulator/">packages</a> of 1.5.4 available by Lucian Langa.</li>
-   <li><a href="http://www.freebsd.org/">FreeBSD</a> has a port of 1.5.6 available as <a href="http://svnweb.freebsd.org/ports/head/emulators/fuse/">emulators/fuse</a>.</li>
-   <li><a href="https://www.gentoo.org/">Gentoo</a> users have an <a href="https://packages.gentoo.org/packages/app-emulation/fuse">ebuild</a> of 1.5.6 available.</li>
-   <li><a href="http://www.netbsd.org/">NetBSD</a> users can get version 1.5.6 from <a href="http://www.pkgsrc.org/">pkgsrc</a> (the NetBSD Packages Collection) as <a href="http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/emulators/fuse-emulator/">emulators/fuse-emulator</a> and <a href="http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/emulators/fuse-emulator-utils/">emulators/fuse-emulator-utils</a>.</li>
+   <li><a href="http://www.freebsd.org/">FreeBSD</a> has a port of 1.5.7 available as <a href="http://svnweb.freebsd.org/ports/head/emulators/fuse/">emulators/fuse</a>.</li>
+   <li><a href="https://www.gentoo.org/">Gentoo</a> users have an <a href="https://packages.gentoo.org/packages/app-emulation/fuse">ebuild</a> of 1.5.7 available.</li>
+   <li><a href="http://www.netbsd.org/">NetBSD</a> users can get version 1.5.7 from <a href="http://www.pkgsrc.org/">pkgsrc</a> (the NetBSD Packages Collection) as <a href="http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/emulators/fuse-emulator/">emulators/fuse-emulator</a> and <a href="http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/emulators/fuse-emulator-utils/">emulators/fuse-emulator-utils</a>.</li>
    <li><a href="http://www.openbsd.org/">OpenBSD</a> users have version 1.5.2 available as the fuse and fuse-utils package, with thanks to Anthony J. Bentley.</li>
-   <li><a href="https://www.opensuse.org/">openSUSE</a> users have version 1.5.5 as the <a href="https://build.opensuse.org/package/show/Emulators/Fuse">Fuse</a> package from Emulators repository.</li>
-   <li>The <a href="https://www.pld-linux.org/">Polish Linux Distribution</a> has packages of <a href="http://sophie.zarb.org/search?search=fuse-gtk&amp;type=fuzzyname&amp;deptype=P&amp;distribution=PLD&amp;release=th&amp;arch=">Fuse</a> 1.5.5 and the <a href="http://sophie.zarb.org/search?search=fuse-utils&amp;type=fuzzyname&amp;deptype=P&amp;distribution=PLD&amp;release=th&amp;arch=">utilities</a>.</li>
-   <li><a href="http://www.ubuntu.com/">Ubuntu</a> has <a href="https://launchpad.net/ubuntu/+source/fuse-emulator">packages</a> of 1.5.6 available by Alberto Garcia.</li>
-   <li><a href="http://brew.sh/">Homebrew</a> provides <a href="https://github.com/Homebrew/homebrew-core/blob/master/Formula/fuse-emulator.rb">packages</a> of 1.5.5 for macOS as "homebrew/games/fuse-emulator".</li>
+   <li><a href="https://www.opensuse.org/">openSUSE</a> users have version 1.5.7 as the <a href="https://build.opensuse.org/package/show/Emulators/Fuse">Fuse</a> package from Emulators repository.</li>
+   <li>The <a href="https://www.pld-linux.org/">Polish Linux Distribution</a> has packages of <a href="http://sophie.zarb.org/search?search=fuse-gtk&amp;type=fuzzyname&amp;deptype=P&amp;distribution=PLD&amp;release=th&amp;arch=">Fuse</a> 1.5.7 and the <a href="http://sophie.zarb.org/search?search=fuse-utils&amp;type=fuzzyname&amp;deptype=P&amp;distribution=PLD&amp;release=th&amp;arch=">utilities</a>.</li>
+   <li><a href="http://www.ubuntu.com/">Ubuntu</a> has <a href="https://launchpad.net/ubuntu/+source/fuse-emulator">packages</a> of 1.5.7 available by Alberto Garcia.</li>
+   <li><a href="http://brew.sh/">Homebrew</a> provides <a href="https://github.com/Homebrew/homebrew-core/blob/master/Formula/fuse-emulator.rb">packages</a> of 1.5.7 for macOS as "homebrew/games/fuse-emulator".</li>
    <li><a href="http://www.slackware.com/">Slackware</a> users can get version 1.5.5 from SlackBuilds as a <a href="http://slackbuilds.org/result/?search=fuse-emulator">build script</a>.</li>
   </ul>
   <p>Packages of older versions of Fuse are also available for some other distributions:</p>
@@ -105,13 +106,13 @@ fuse_section ("Download", "Downloads", <<<END_SECTION
   <p>A native port to macOS by <a href="mailto:fr...@sp...">Fredrick Meunier</a> is available on its own SourceForge project <a href="http://fuse-for-macosx.sourceforge.net/">here</a>, as well as a Spotlight importer for Mac OS X 10.4 Tiger users. Alternatively, the original version of Fuse will compile on OS X 10.3 (Panther) or later.</p>
 
   <h3>Windows</h3>
-  <p>A port to Windows of 1.5.7 by Sergio Baldoví is available <a href="https://sourceforge.net/projects/fuse-emulator/files/fuse/1.5.7/fuse-1.5.7-win32-setup.exe/download">here</a>, and the utilities are available <a href="https://sourceforge.net/projects/fuse-emulator/files/fuse-utils/1.4.3/fuse-utils-1.4.3-win32.zip/download">here</a>.</p>
+  <p>A port to Windows of 1.6.0 by Sergio Baldoví is available <a href="https://sourceforge.net/projects/fuse-emulator/files/fuse/1.6.0/fuse-1.6.0-win32-setup.exe/download">here</a>, and the utilities are available <a href="https://sourceforge.net/projects/fuse-emulator/files/fuse-utils/1.4.3/fuse-utils-1.4.3-win32.zip/download">here</a>.</p>
 
   <h3>Android</h3>
   <p>BogDan Vatra has ported Fuse 1.3.2 to Android OS, which could run on smartphones, tablets and TVs. Sources are available from <a href="https://github.com/bog-dan-ro/spectacol/releases/tag/v3.0.4">GitHub</a> and binaries from <a href="https://play.google.com/store/apps/details?id=eu.licentia.games.spectacol">Google Play</a>.</p>
 
   <h3>Haiku</h3>
-  <p>Adrien Destugues has ported Fuse 1.1.1 to Haiku, available from haikuports as <a href="https://github.com/haikuports/haikuports/tree/master/app-emulation/fuse">app-emulation/fuse</a> and <a href="https://github.com/haikuports/haikuports/tree/master/app-emulation/fuse-utils">app-emulation/fuse-utils</a>.</p>
+  <p>Adrien Destugues has ported Fuse 1.5.6 to Haiku, available from haikuports as <a href="https://github.com/haikuports/haikuports/tree/master/app-emulation/fuse">app-emulation/fuse</a> and <a href="https://github.com/haikuports/haikuports/tree/master/app-emulation/fuse-utils">app-emulation/fuse-utils</a>.</p>
 
   <h3>AmigaOS 4</h3>
   <p>Chris Young has ported Fuse 1.0.0.1 to AmigaOS 4, with binaries available from Aminet as <a href="http://aminet.net/package/misc/emu/fuse.lha">misc/emu/fuse.lha</a>.</p>
@@ -171,7 +172,7 @@ you'll still need <a href="libspectrum.php">libspectrum</a> installed to run the
    <dt>Required:</dt>
    <dd>
     <ul>
-     <li>X, <a href="http://www.libsdl.org/">SDL</a>, <a href="http://www.svgalib.org/">svgalib</a> or framebuffer support. If you have <a href="http://www.gtk.org/">GTK+</a> installed, you'll get a (much) nicer user interface under X.</li>
+     <li>X, <a href="http://www.libsdl.org/">SDL</a>, <a href="http://www.svgalib.org/">svgalib</a> or framebuffer support. If you have <a href="http://www.gtk.org/">GTK</a> installed, you'll get a (much) nicer user interface under X.</li>
      <li><a href="libspectrum.php">libspectrum</a>: the Spectrum emulator file format and information library.</li>
     </ul>
    </dd>
@@ -196,6 +197,32 @@ END_SECTION
 #<!-- ======================================================= -->
 
 fuse_section (NULL, "What's new?", <<<END_SECTION
+  <h3>1.6.0</h3>
+  <ul>
+    <li>Add TTX2000S emulation</li>
+    <li>Experimental PulseAudio sound driver</li>
+    <li>Fix activation of joystick and IF2 peripherals when loading a snapshot</li>
+    <li>GTK/Win32: New higher resolution keyboard picture on GTK and win32 UIs</li>
+    <li>GTK: Add Fuse icon to the about dialog and the main window</li>
+    <li>GTK: Load/save binary dialog remembers last values</li>
+    <li>GTK 3: Improve moving and sizing Fuse's window under Wayland</li>
+    <li>GTK 3: Fix kempston mouse values on Wayland</li>
+    <li>GTK 3: Fix bug when resizing from 2x to 3x</li>
+    <li>SDL: Fix crash when using dispmanx backend on the Raspberry Pi</li>
+    <li>SDL: Allow forcing fullscreen mode when SDL doesn't report available screen modes</li>
+    <li>WidgetUI: New dialog to load/save binary data (Gergely Szasz).</li>
+    <li>WidgetUI: Enable HOME and END keys in menus</li>
+    <li>WidgetUI: Use monospaced characters on memory browser</li>
+    <li>WidgetUI: Fix crash when trying to overwrite read-only files</li>
+    <li>Win32: Fix bitwise operation in debugger</li>
+    <li>Xlib: Try to keep graphic filter when the user resize the window</li>
+    <li>Fix display corruption with HQ 3x scaler</li>
+    <li>Fix antialiasing effect of AdvMAME3x scaler</li>
+    <li>Add 4x, TV 4x, Pal TV 4x and HQ 4x scalers on GTK, SDL, win32 and Xlib UIs</li>
+    <li>Allow screenshots with TV 3x, PAL TV and Timex 1.5x scalers</li>
+    <li>Various minor bugfixes</li>
+  </ul>
+
   <h3>1.5.7</h3>
   <ul>
     <li>GTK+ 3: Make the offset entry wider in memory browser</li>
diff --git a/libspectrum.php b/libspectrum.php
index f0713f7..043339c 100644
--- a/libspectrum.php
+++ b/libspectrum.php
@@ -1,7 +1,7 @@
 <?php
 
 /* libspectrum.php: the libspectrum 'home' page
-   Copyright (c) 1999-2018 Darren Salt, Philip Kendall
+   Copyright (c) 1999-2021 Darren Salt, Philip Kendall
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -80,24 +80,24 @@ fuse_section ("Download", "Downloads", <<<END_SECTION
 
   <h3>Source</h3>
   <ul>
-   <li><a href="https://sourceforge.net/projects/fuse-emulator/files/libspectrum/1.4.4/libspectrum-1.4.4.tar.gz/download">libspectrum-1.4.4.tar.gz</a> (<a href="https://sourceforge.net/projects/fuse-emulator/files/libspectrum/1.4.4/libspectrum-1.4.4.tar.gz.sig/download">PGP signature</a>)<!-- or from <a href="ftp://ftp.worldofspectrum.org/pub/sinclair/emulators/unix/libspectrum-1.4.4.tar.gz">World of Spectrum</a> (<a href="ftp://ftp.worldofspectrum.org/pub/sinclair/emulators/unix/libspec [...]
+   <li><a href="https://sourceforge.net/projects/fuse-emulator/files/libspectrum/1.5.0/libspectrum-1.5.0.tar.gz/download">libspectrum-1.5.0.tar.gz</a> (<a href="https://sourceforge.net/projects/fuse-emulator/files/libspectrum/1.5.0/libspectrum-1.5.0.tar.gz.sig/download">PGP signature</a>)<!-- or from <a href="ftp://ftp.worldofspectrum.org/pub/sinclair/emulators/unix/libspectrum-1.5.0.tar.gz">World of Spectrum</a> (<a href="ftp://ftp.worldofspectrum.org/pub/sinclair/emulators/unix/libspec [...]
    <li>The source code release above is signed with the <a href="http://wwwkeys.pgp.net:11371/pks/lookup?op=get&amp;search=0xD0767AB9">Fuse Release Key, ID <tt>D0767AB9</tt></a>, which has fingerprint <tt>064E 0BA9 688F 2699 3267 B1E5 1043 EEEB D076 7AB9</tt>. This is different from the key used to sign the 0.1.1 release as I forgot the passphrase for that key <tt>:-(</tt>.</li>
   </ul>
 
   <h3>Binaries</h3>
   <p>Packages are available for some Unix distributions; in general, any problems which are specific to the packages should be sent to the package maintainer.</p>
   <ul>
-   <li><a href="https://www.archlinux.org/">Arch Linux</a> has 1.4.3 available from the <a href="https://aur.archlinux.org/packages/libspectrum/">Arch User Repository</a>.</li>
-   <li><a href="http://packages.debian.org/search?keywords=libspectrum">Official packages</a> of 1.4.3 for <a href="http://www.debian.org/">Debian</a>, maintained by Alberto Garcia, are available.</li>
+   <li><a href="https://www.archlinux.org/">Arch Linux</a> has 1.4.4 available from the <a href="https://aur.archlinux.org/packages/libspectrum/">Arch User Repository</a>.</li>
+   <li><a href="http://packages.debian.org/search?keywords=libspectrum">Official packages</a> of 1.4.4 for <a href="http://www.debian.org/">Debian</a>, maintained by Alberto Garcia, are available.</li>
    <li><a href="https://apps.fedoraproject.org/packages/libspectrum">Fedora</a> (1.4.3)</li>
-   <li><a href="http://svnweb.freebsd.org/ports/head/emulators/libspectrum/">FreeBSD</a> (1.4.3)</li>
-   <li><a href="https://packages.gentoo.org/packages/app-emulation/libspectrum">Gentoo</a> (1.4.2)</li>
-   <li><a href="http://www.netbsd.org/">NetBSD</a> has 1.4.3 available as <a href="http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/emulators/libspectrum/">emulators/libspectrum</a> in <a href="http://www.pkgsrc.org/">pkgsrc</a>.</li>
-   <li><a href="http://www.openbsd.org/">OpenBSD</a> has 1.4.3 available as libspectrum package.</li>
-   <li><a href="https://build.opensuse.org/package/show/Emulators/libspectrum">openSUSE</a> (1.4.2)</li>
-   <li><a href="http://www.slackware.com/">Slackware</a> has 1.3.5 available from <a href="http://slackbuilds.org/result/?search=libspectrum">SlackBuilds</a>.</li>
-   <li><a href="https://launchpad.net/ubuntu/+source/libspectrum">Ubuntu</a> (1.4.3)</li>
-   <li><a href="https://github.com/Homebrew/homebrew-core/blob/master/Formula/libspectrum.rb">Homebrew for macOS</a> (1.4.3)</li>
+   <li><a href="http://svnweb.freebsd.org/ports/head/emulators/libspectrum/">FreeBSD</a> (1.4.4)</li>
+   <li><a href="https://packages.gentoo.org/packages/app-emulation/libspectrum">Gentoo</a> (1.4.4)</li>
+   <li><a href="http://www.netbsd.org/">NetBSD</a> has 1.4.4 available as <a href="http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/emulators/libspectrum/">emulators/libspectrum</a> in <a href="http://www.pkgsrc.org/">pkgsrc</a>.</li>
+   <li><a href="http://www.openbsd.org/">OpenBSD</a> has 1.4.4 available as libspectrum package.</li>
+   <li><a href="https://build.opensuse.org/package/show/Emulators/libspectrum">openSUSE</a> (1.4.4)</li>
+   <li><a href="http://www.slackware.com/">Slackware</a> has 1.4.4 available from <a href="http://slackbuilds.org/result/?search=libspectrum">SlackBuilds</a>.</li>
+   <li><a href="https://launchpad.net/ubuntu/+source/libspectrum">Ubuntu</a> (1.4.4)</li>
+   <li><a href="https://github.com/Homebrew/homebrew-core/blob/master/Formula/libspectrum.rb">Homebrew for macOS</a> (1.4.4)</li>
   </ul>
 
 END_SECTION

[fuse-emulator-cvs] [libspectrum] branch master updated: Add new test case tzx files

[<fr...@us...>]

This is an automated email from the git hooks/post-receive-user script.

fredm pushed a commit to branch master
in repository libspectrum.

View the commit online:
https://sourceforge.net/p/fuse-emulator/libspectrum/ci/f982a143c239497cc7ad7da4a805aa2ab7855970/

The following commit(s) were added to refs/heads/master by this push:
     new f982a14  Add new test case tzx files
f982a14 is described below

commit f982a143c239497cc7ad7da4a805aa2ab7855970
Author: Fredrick Meunier <fr...@sp...>
AuthorDate: Sat Feb 27 13:56:51 2021 +1100

    Add new test case tzx files
---
 test/Makefile.am | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/Makefile.am b/test/Makefile.am
index 553f08d..b1e5c13 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -60,6 +60,7 @@ EXTRA_DIST += \
 	test/no-pilot-gdb.tzx \
 	test/plus3.z80 \
 	test/random.szx \
+	test/raw-data-block.tzx \
 	test/sp-2000.sna.gz \
 	test/sp-ffff.sna.gz \
 	test/standard-tap.tap \
@@ -83,6 +84,7 @@ EXTRA_DIST += \
 	test/szx-chunks/ZXAT.szx \
 	test/szx-chunks/ZXCF.szx \
 	test/szx-chunks/ZXPR.szx \
+	test/trailing-pause-block.tzx \
 	test/turbo-zeropilot.tzx \
 	test/writeprotected.mdr \
 	test/zero-tail.pzx

[fuse-emulator-cvs] [fuse] branch master updated: Update dates for 1.6.0 release

[<fr...@us...>]

This is an automated email from the git hooks/post-receive-user script.

fredm pushed a commit to branch master
in repository fuse.

View the commit online:
https://sourceforge.net/p/fuse-emulator/fuse/ci/b2f1ea6cb63eb2849d2c9e138313aa425808be98/

The following commit(s) were added to refs/heads/master by this push:
     new b2f1ea6c Update dates for 1.6.0 release
b2f1ea6c is described below

commit b2f1ea6cb63eb2849d2c9e138313aa425808be98
Author: Fredrick Meunier <fr...@sp...>
AuthorDate: Sat Feb 27 13:16:48 2021 +1100

    Update dates for 1.6.0 release
---
 ChangeLog  | 2 +-
 README     | 2 +-
 man/fuse.1 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 58ca9059..44ef32a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-2021-02-20  Philip Kendall  <phi...@sh...>
+2021-02-27  Philip Kendall  <phi...@sh...>
 
         * Fuse 1.6.0 released.
 
diff --git a/README b/README
index 7c6fc1b3..5f7181e2 100644
--- a/README
+++ b/README
@@ -114,4 +114,4 @@ Usenet newsgroup `comp.sys.sinclair' or the World of Spectrum forums
 <http://www.worldofspectrum.org/forums/>.
 
 Philip Kendall <phi...@sh...>
-20th February, 2021
+27th February, 2021
diff --git a/man/fuse.1 b/man/fuse.1
index 935a530a..c8b948a1 100644
--- a/man/fuse.1
+++ b/man/fuse.1
@@ -23,7 +23,7 @@
 .\" E-mail: phi...@sh...
 .\"
 .\"
-.TH fuse 1 "20th February, 2021" "Version 1.6.0" "Emulators"
+.TH fuse 1 "27th February, 2021" "Version 1.6.0" "Emulators"
 .\"
 .\"------------------------------------------------------------------
 .\"

[fuse-emulator-cvs] [libspectrum] branch master updated: Update date for next release

[<fr...@us...>]

This is an automated email from the git hooks/post-receive-user script.

fredm pushed a commit to branch master
in repository libspectrum.

View the commit online:
https://sourceforge.net/p/fuse-emulator/libspectrum/ci/07f7c201f14531b9daac2a1947607d23459570dc/

The following commit(s) were added to refs/heads/master by this push:
     new 07f7c20  Update date for next release
07f7c20 is described below

commit 07f7c201f14531b9daac2a1947607d23459570dc
Author: Fredrick Meunier <fr...@sp...>
AuthorDate: Sat Feb 27 09:20:48 2021 +1100

    Update date for next release
---
 README            | 2 +-
 doc/libspectrum.3 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README b/README
index 502ce45..8564558 100644
--- a/README
+++ b/README
@@ -67,4 +67,4 @@ Wii. At the time of writing, those haven't been ported yet.
 Then, type "make" and if everything went well, "make install".
 
 Philip Kendall <phi...@sh...>
-20th February, 2021
+27th February, 2021
diff --git a/doc/libspectrum.3 b/doc/libspectrum.3
index 86266f8..205c109 100644
--- a/doc/libspectrum.3
+++ b/doc/libspectrum.3
@@ -22,7 +22,7 @@
 .\" E-mail: phi...@sh...
 .\"
 .\"
-.TH libspectrum 3 "20th February, 2021" "Version 1.5.0" "Emulators"
+.TH libspectrum 3 "27th February, 2021" "Version 1.5.0" "Emulators"
 .\"
 .\"------------------------------------------------------------------
 .\"

[fuse-emulator-cvs] [libspectrum] 02/02: Specify config.h as a local header

[<fr...@us...>]

This is an automated email from the git hooks/post-receive-user script.

fredm pushed a commit to branch master
in repository libspectrum.

View the commit online:
https://sourceforge.net/p/fuse-emulator/libspectrum/ci/c2d350e6e93a8c71a53f5ae1a605aa5d0745930d/

commit c2d350e6e93a8c71a53f5ae1a605aa5d0745930d
Author: Fredrick Meunier <fr...@sp...>
AuthorDate: Sat Feb 27 09:17:14 2021 +1100

    Specify config.h as a local header
---
 .gitignore      | 1 +
 buffer.c        | 2 +-
 bzip2.c         | 2 +-
 creator.c       | 2 +-
 crypto.c        | 2 +-
 csw.c           | 2 +-
 dck.c           | 2 +-
 dll.c           | 2 +-
 ide.c           | 2 +-
 libspectrum.c   | 2 +-
 make-perl.c     | 2 +-
 memory.c        | 2 +-
 microdrive.c    | 2 +-
 mmc.c           | 2 +-
 myglib/garray.c | 2 +-
 myglib/ghash.c  | 2 +-
 myglib/glock.c  | 2 +-
 myglib/gslist.c | 2 +-
 plusd.c         | 2 +-
 pzx_read.c      | 2 +-
 rzx.c           | 2 +-
 sna.c           | 2 +-
 snapshot.c      | 2 +-
 snp.c           | 2 +-
 sp.c            | 2 +-
 symbol_table.c  | 2 +-
 szx.c           | 2 +-
 tap.c           | 2 +-
 tape.c          | 2 +-
 tape_block.c    | 2 +-
 test/szx.c      | 2 +-
 test/test.c     | 2 +-
 timings.c       | 2 +-
 tzx_read.c      | 2 +-
 tzx_write.c     | 2 +-
 utilities.c     | 2 +-
 warajevo_read.c | 2 +-
 wav.c           | 2 +-
 z80.c           | 2 +-
 z80em.c         | 2 +-
 zip.c           | 2 +-
 zlib.c          | 2 +-
 zxs.c           | 2 +-
 43 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/.gitignore b/.gitignore
index d61dce3..3fb44d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@
 /config.status
 /config.sub
 /configure
+cscope.out
 .DS_Store
 /depcomp
 .deps
diff --git a/buffer.c b/buffer.c
index 798ac29..9964e3f 100644
--- a/buffer.c
+++ b/buffer.c
@@ -28,7 +28,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <string.h>
 
diff --git a/bzip2.c b/bzip2.c
index 63c10f5..730cb8e 100644
--- a/bzip2.c
+++ b/bzip2.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #ifdef HAVE_LIBBZ2
 
diff --git a/creator.c b/creator.c
index 31dc936..4c4702e 100644
--- a/creator.c
+++ b/creator.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <string.h>
diff --git a/crypto.c b/crypto.c
index d96e896..580a6cb 100644
--- a/crypto.c
+++ b/crypto.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #ifdef HAVE_GCRYPT_H
 
diff --git a/csw.c b/csw.c
index 51880c1..098fdd4 100644
--- a/csw.c
+++ b/csw.c
@@ -22,7 +22,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 #include <string.h>
 
 #include "internals.h"
diff --git a/dck.c b/dck.c
index e9d04c3..b2f060f 100644
--- a/dck.c
+++ b/dck.c
@@ -23,7 +23,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/dll.c b/dll.c
index 7ad80e7..a1404f3 100644
--- a/dll.c
+++ b/dll.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include "internals.h"
 
diff --git a/ide.c b/ide.c
index 7436208..a634a25 100644
--- a/ide.c
+++ b/ide.c
@@ -22,7 +22,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <errno.h>
 #include <stdio.h>
diff --git a/libspectrum.c b/libspectrum.c
index 9f9b423..486bcde 100644
--- a/libspectrum.c
+++ b/libspectrum.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <string.h>
diff --git a/make-perl.c b/make-perl.c
index 8a37cce..ea2f694 100644
--- a/make-perl.c
+++ b/make-perl.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 
diff --git a/memory.c b/memory.c
index 1675b81..7ebada9 100644
--- a/memory.c
+++ b/memory.c
@@ -22,7 +22,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdlib.h>
 
diff --git a/microdrive.c b/microdrive.c
index 73a17a2..adf1eea 100644
--- a/microdrive.c
+++ b/microdrive.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <string.h>
 
diff --git a/mmc.c b/mmc.c
index 874b18a..27d05c0 100644
--- a/mmc.c
+++ b/mmc.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <string.h>
diff --git a/myglib/garray.c b/myglib/garray.c
index db1b23c..696a06e 100644
--- a/myglib/garray.c
+++ b/myglib/garray.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #ifndef HAVE_LIB_GLIB		/* Use this iff we're not using the 
 				   `proper' glib */
diff --git a/myglib/ghash.c b/myglib/ghash.c
index a6ab2c0..c167488 100644
--- a/myglib/ghash.c
+++ b/myglib/ghash.c
@@ -30,7 +30,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #ifndef HAVE_LIB_GLIB		/* Use this iff we're not using the
 				   `proper' glib */
diff --git a/myglib/glock.c b/myglib/glock.c
index 84c2dd9..b3a6078 100644
--- a/myglib/glock.c
+++ b/myglib/glock.c
@@ -20,7 +20,7 @@
    BogDan Vatra <bo...@kd...>
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdatomic.h>
 
diff --git a/myglib/gslist.c b/myglib/gslist.c
index 496c93f..51285a9 100644
--- a/myglib/gslist.c
+++ b/myglib/gslist.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #ifndef HAVE_LIB_GLIB		/* Use this iff we're not using the
 				   `proper' glib */
diff --git a/plusd.c b/plusd.c
index 5d9f659..9268e69 100644
--- a/plusd.c
+++ b/plusd.c
@@ -22,7 +22,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <string.h>
 
diff --git a/pzx_read.c b/pzx_read.c
index 9315181..b756763 100644
--- a/pzx_read.c
+++ b/pzx_read.c
@@ -22,7 +22,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <stddef.h>
 #include <stdio.h>
diff --git a/rzx.c b/rzx.c
index bb03c18..c5dcce9 100644
--- a/rzx.c
+++ b/rzx.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <stddef.h>
 #include <stdio.h>
diff --git a/sna.c b/sna.c
index c40b827..7a4b193 100644
--- a/sna.c
+++ b/sna.c
@@ -22,7 +22,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <string.h>
 
diff --git a/snapshot.c b/snapshot.c
index 399ed77..e6f47d8 100644
--- a/snapshot.c
+++ b/snapshot.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <string.h>
 
diff --git a/snp.c b/snp.c
index 15772c7..1779e56 100644
--- a/snp.c
+++ b/snp.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include "internals.h"
 
diff --git a/sp.c b/sp.c
index 2811d0e..adb8a43 100644
--- a/sp.c
+++ b/sp.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <string.h>
 
diff --git a/symbol_table.c b/symbol_table.c
index 6d69e3f..e6d8bad 100644
--- a/symbol_table.c
+++ b/symbol_table.c
@@ -22,7 +22,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include "tape_block.h"
 
diff --git a/szx.c b/szx.c
index 57756c1..51dc7e2 100644
--- a/szx.c
+++ b/szx.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <string.h>
 
diff --git a/tap.c b/tap.c
index 9bb4cf5..1823d05 100644
--- a/tap.c
+++ b/tap.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <stddef.h>
 #include <string.h>
diff --git a/tape.c b/tape.c
index 4beb177..94ee726 100644
--- a/tape.c
+++ b/tape.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <string.h>
diff --git a/tape_block.c b/tape_block.c
index 8b986fd..141c70c 100644
--- a/tape_block.c
+++ b/tape_block.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <math.h>
 
diff --git a/test/szx.c b/test/szx.c
index 2980773..4850cb5 100644
--- a/test/szx.c
+++ b/test/szx.c
@@ -25,7 +25,7 @@
    file. It very deliberately does not use any of the core libspectrum code for
    this as that would defeat the point of a unit test */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <string.h>
diff --git a/test/test.c b/test/test.c
index 22410d5..e9a1bde 100644
--- a/test/test.c
+++ b/test/test.c
@@ -1,4 +1,4 @@
-#include <config.h>
+#include "config.h"
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/timings.c b/timings.c
index 4b7ba78..9ce8b1a 100644
--- a/timings.c
+++ b/timings.c
@@ -22,7 +22,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <string.h>
 
diff --git a/tzx_read.c b/tzx_read.c
index 3b8bfa3..718a2d8 100644
--- a/tzx_read.c
+++ b/tzx_read.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <math.h>
 #include <stddef.h>
diff --git a/tzx_write.c b/tzx_write.c
index 8f65984..448cc24 100644
--- a/tzx_write.c
+++ b/tzx_write.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <string.h>
diff --git a/utilities.c b/utilities.c
index 0aa9cb1..09d5d43 100644
--- a/utilities.c
+++ b/utilities.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include "internals.h"
 
diff --git a/warajevo_read.c b/warajevo_read.c
index 115d397..ee9eca2 100644
--- a/warajevo_read.c
+++ b/warajevo_read.c
@@ -22,7 +22,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <stddef.h>
 #include <stdio.h>
diff --git a/wav.c b/wav.c
index 76b3f25..1843160 100644
--- a/wav.c
+++ b/wav.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 #include <string.h>
 
 #ifdef HAVE_LIB_AUDIOFILE
diff --git a/z80.c b/z80.c
index d819384..f7985f1 100644
--- a/z80.c
+++ b/z80.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/z80em.c b/z80em.c
index 08ea19e..964e857 100644
--- a/z80em.c
+++ b/z80em.c
@@ -23,7 +23,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 #include <string.h>
 
 #include "internals.h"
diff --git a/zip.c b/zip.c
index 02df1dc..f7931e8 100644
--- a/zip.c
+++ b/zip.c
@@ -24,7 +24,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <string.h>
 
diff --git a/zlib.c b/zlib.c
index 9f1b763..ee8c19a 100644
--- a/zlib.c
+++ b/zlib.c
@@ -24,7 +24,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <errno.h>
 #include <stdio.h>
diff --git a/zxs.c b/zxs.c
index e56d8d0..cd74362 100644
--- a/zxs.c
+++ b/zxs.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <string.h>
 

[fuse-emulator-cvs] [libspectrum] 01/02: Add more ChangeLog entries

[<fr...@us...>]

This is an automated email from the git hooks/post-receive-user script.

fredm pushed a commit to branch master
in repository libspectrum.

View the commit online:
https://sourceforge.net/p/fuse-emulator/libspectrum/ci/99f822b8868075742e60cb8dc0d691ec87ef895f/

commit 99f822b8868075742e60cb8dc0d691ec87ef895f
Author: Fredrick Meunier <fr...@sp...>
AuthorDate: Sat Feb 27 09:15:03 2021 +1100

    Add more ChangeLog entries
---
 ChangeLog | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 30d32fd..7f662dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-2021-02-20  Philip Kendall  <phi...@sh...>
+2021-02-27  Philip Kendall  <phi...@sh...>
 
         * libspectrum 1.5.0 released.
 
@@ -6,6 +6,11 @@
           * Autogenerate code for initialising/freeing snap structure (Sergio
             Baldoví).
           * Fix loading of raw data blocks (Alberto Garcia).
+          * Ensure trailing TZX pause blocks result in an edge (Alberto
+            Garcia).
+          * Fix bits_through_byte calculation in TZX RAW block (Alberto
+            Garcia).
+          * Remove spurious first pulse in a raw data block (Alberto Garcia).
           * Minimal snapshot support for TTX2000S interface (Sergio Baldoví).
           * Fix prototypes and warnings for MorphOS (Stefan Haubenthal).
           * Change type of len field in GArray to guint (Sergio Baldoví).

[fuse-emulator-cvs] [libspectrum] branch master updated (abd121a -> c2d350e)

[<fr...@us...>]

This is an automated email from the git hooks/post-receive-user script.

fredm pushed a change to branch master
in repository libspectrum.

    from abd121a  Focus test_74 on the relevant flags
     new 99f822b  Add more ChangeLog entries
     new c2d350e  Specify config.h as a local header

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .gitignore      | 1 +
 ChangeLog       | 7 ++++++-
 buffer.c        | 2 +-
 bzip2.c         | 2 +-
 creator.c       | 2 +-
 crypto.c        | 2 +-
 csw.c           | 2 +-
 dck.c           | 2 +-
 dll.c           | 2 +-
 ide.c           | 2 +-
 libspectrum.c   | 2 +-
 make-perl.c     | 2 +-
 memory.c        | 2 +-
 microdrive.c    | 2 +-
 mmc.c           | 2 +-
 myglib/garray.c | 2 +-
 myglib/ghash.c  | 2 +-
 myglib/glock.c  | 2 +-
 myglib/gslist.c | 2 +-
 plusd.c         | 2 +-
 pzx_read.c      | 2 +-
 rzx.c           | 2 +-
 sna.c           | 2 +-
 snapshot.c      | 2 +-
 snp.c           | 2 +-
 sp.c            | 2 +-
 symbol_table.c  | 2 +-
 szx.c           | 2 +-
 tap.c           | 2 +-
 tape.c          | 2 +-
 tape_block.c    | 2 +-
 test/szx.c      | 2 +-
 test/test.c     | 2 +-
 timings.c       | 2 +-
 tzx_read.c      | 2 +-
 tzx_write.c     | 2 +-
 utilities.c     | 2 +-
 warajevo_read.c | 2 +-
 wav.c           | 2 +-
 z80.c           | 2 +-
 z80em.c         | 2 +-
 zip.c           | 2 +-
 zlib.c          | 2 +-
 zxs.c           | 2 +-
 44 files changed, 49 insertions(+), 43 deletions(-)