Attachment 201911 Details for Bug 223538 – svn-diff-visualboyadvance

[patch] svn-diff-visualboyadvance

svn-diff-visualboyadvance (text/plain), 23.59 KB, created by Walter Schwarzenfeld on 2019-02-11 01:55:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Walter Schwarzenfeld

Created: 2019-02-11 01:55:06 UTC

Size: 23.59 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 492659)
>+++ Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	visualboyadvance-m
> PORTVERSION=	2.0.0b2
>-PORTREVISION=	6
>+PORTREVISION=	7
> CATEGORIES=	emulators
> 
> MAINTAINER=	root@cooltrainer.org
>@@ -13,7 +13,6 @@
> 
> LIB_DEPENDS=	libpng.so:graphics/png
> 
>-BROKEN=			fails to build
> BROKEN_aarch64=		fails to build: regparm is not valid on this platform
> BROKEN_armv6=		fails to build: regparm is not valid on this platform
> BROKEN_armv7=		fails to build: regparm is not valid on this platform
>@@ -41,7 +40,7 @@
> USE_XORG=	x11 xext
> USE_GL=		gl glu
> USE_SDL=	sdl
>-USES=		cmake:insource dos2unix pkgconfig
>+USES=		compiler:c++11-lang cmake:insource dos2unix pkgconfig
> INSTALLS_ICONS=	yes
> CMAKE_ARGS=	-DVERSION:STRING="${PORTVERSION}" \
> 		-DSYSCONFDIR:STRING="${PREFIX}/etc"  \
>Index: files/patch-fex_fex-Binary_Extractor.cpp
>===================================================================
>--- files/patch-fex_fex-Binary_Extractor.cpp	(nonexistent)
>+++ files/patch-fex_fex-Binary_Extractor.cpp	(working copy)
>@@ -0,0 +1,28 @@
>+--- fex/fex/Binary_Extractor.cpp.orig	2019-02-11 00:54:35 UTC
>++++ fex/fex/Binary_Extractor.cpp
>+@@ -41,14 +41,14 @@ Binary_Extractor::~Binary_Extractor()
>+ blargg_err_t Binary_Extractor::open_path_v()
>+ {
>+ 	set_name( arc_path() );
>+-	return blargg_ok;
>++	return (char*)blargg_ok;
>+ }
>+ 
>+ blargg_err_t Binary_Extractor::open_v()
>+ {
>+ 	set_name( arc_path() );
>+ 	set_info( arc().remain(), 0, 0 );
>+-	return blargg_ok;
>++	return (char*)blargg_ok;
>+ }
>+ 
>+ void Binary_Extractor::close_v()
>+@@ -56,7 +56,7 @@ void Binary_Extractor::close_v()
>+ 
>+ blargg_err_t Binary_Extractor::next_v()
>+ {
>+-	return blargg_ok;
>++	return (char*)blargg_ok;
>+ }
>+ 
>+ blargg_err_t Binary_Extractor::rewind_v()
>
>Property changes on: files/patch-fex_fex-Binary_Extractor.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-fex_fex-Data_Reader.cpp
>===================================================================
>--- files/patch-fex_fex-Data_Reader.cpp	(nonexistent)
>+++ files/patch-fex_fex-Data_Reader.cpp	(working copy)
>@@ -0,0 +1,152 @@
>+--- fex/fex/Data_Reader.cpp.orig	2019-02-11 00:54:04 UTC
>++++ fex/fex/Data_Reader.cpp
>+@@ -34,7 +34,7 @@ blargg_err_t Data_Reader::read( void* p,
>+ 		return blargg_err_caller;
>+ 	
>+ 	if ( n <= 0 )
>+-		return blargg_ok;
>++		return (char*)blargg_ok;
>+ 	
>+ 	if ( n > remain() )
>+ 		return blargg_err_file_eof;
>+@@ -57,7 +57,7 @@ blargg_err_t Data_Reader::read_avail( vo
>+ 		return blargg_err_caller;
>+ 	
>+ 	if ( n <= 0 )
>+-		return blargg_ok;
>++		return (char*)blargg_ok;
>+ 	
>+ 	blargg_err_t err = read_v( p, n );
>+ 	if ( !err )
>+@@ -86,7 +86,7 @@ blargg_err_t Data_Reader::skip_v( int co
>+ 		count -= n;
>+ 		RETURN_ERR( read_v( buf, n ) );
>+ 	}
>+-	return blargg_ok;
>++	return (char*)blargg_ok;
>+ }
>+ 
>+ blargg_err_t Data_Reader::skip( int n )
>+@@ -97,7 +97,7 @@ blargg_err_t Data_Reader::skip( int n )
>+ 		return blargg_err_caller;
>+ 	
>+ 	if ( n <= 0 )
>+-		return blargg_ok;
>++		return (char*)blargg_ok;
>+ 	
>+ 	if ( n > remain() )
>+ 		return blargg_err_file_eof;
>+@@ -120,7 +120,7 @@ blargg_err_t File_Reader::seek( int n )
>+ 		return blargg_err_caller;
>+ 	
>+ 	if ( n == tell() )
>+-		return blargg_ok;
>++		return (char*)blargg_ok;
>+ 	
>+ 	if ( n > size() )
>+ 		return blargg_err_file_eof;
>+@@ -188,12 +188,12 @@ Mem_File_Reader::Mem_File_Reader( const 
>+ blargg_err_t Mem_File_Reader::read_v( void* p, int s )
>+ {
>+ 	memcpy( p, begin + tell(), s );
>+-	return blargg_ok;
>++	return (char*)blargg_ok;
>+ }
>+ 
>+ blargg_err_t Mem_File_Reader::seek_v( int )
>+ {
>+-	return blargg_ok;
>++	return (char*)blargg_ok;
>+ }
>+ 
>+ 
>+@@ -228,7 +228,7 @@ blargg_err_t Callback_File_Reader::read_
>+ 
>+ blargg_err_t Callback_File_Reader::seek_v( int )
>+ {
>+-	return blargg_ok;
>++	return (char*)blargg_ok;
>+ }
>+ 
>+ static const BOOST::uint8_t mask_tab[6]={0x80,0xE0,0xF0,0xF8,0xFC,0xFE};
>+@@ -563,7 +563,7 @@ static blargg_err_t blargg_fopen( FILE**
>+ 		return blargg_err_file_read;
>+ 	}
>+ 	
>+-	return blargg_ok;
>++	return (char*)blargg_ok;
>+ }
>+ 
>+ static blargg_err_t blargg_fsize( FILE* f, long* out )
>+@@ -578,7 +578,7 @@ static blargg_err_t blargg_fsize( FILE* 
>+ 	if ( fseek( f, 0, SEEK_SET ) )
>+ 		return blargg_err_file_io;
>+ 	
>+-	return blargg_ok;
>++	return (char*)blargg_ok;
>+ }
>+ 
>+ blargg_err_t Std_File_Reader::open( const char path [] )
>+@@ -599,7 +599,7 @@ blargg_err_t Std_File_Reader::open( cons
>+ 	file_ = f;
>+ 	set_size( s );
>+ 	
>+-	return blargg_ok;
>++	return (char*)blargg_ok;
>+ }
>+ 
>+ void Std_File_Reader::make_unbuffered()
>+@@ -618,7 +618,7 @@ blargg_err_t Std_File_Reader::read_v( vo
>+ 		return blargg_err_file_io;
>+ 	}
>+ 	
>+-	return blargg_ok;
>++	return (char*)blargg_ok;
>+ }
>+ 
>+ blargg_err_t Std_File_Reader::seek_v( int n )
>+@@ -631,7 +631,7 @@ blargg_err_t Std_File_Reader::seek_v( in
>+ 		return blargg_err_file_io;
>+ 	}
>+ 	
>+-	return blargg_ok;
>++	return (char*)blargg_ok;
>+ }
>+ 
>+ void Std_File_Reader::close()
>+@@ -687,7 +687,7 @@ static const char* get_gzip_eof( const c
>+ 	if ( fclose( file ) )
>+ 		check( false );
>+ 	
>+-	return blargg_ok;
>++	return (char*)blargg_ok;
>+ }
>+ 
>+ Gzip_File_Reader::Gzip_File_Reader()
>+@@ -712,7 +712,7 @@ blargg_err_t Gzip_File_Reader::open( con
>+ 		return blargg_err_file_read;
>+ 	
>+ 	set_size( s );
>+-	return blargg_ok;
>++	return (char*)blargg_ok;
>+ }
>+ 
>+ static blargg_err_t convert_gz_error( gzFile file )
>+@@ -741,7 +741,7 @@ blargg_err_t Gzip_File_Reader::read_v( v
>+ 		return blargg_err_file_corrupt;
>+ 	}
>+ 	
>+-	return blargg_ok;
>++	return (char*)blargg_ok;
>+ }
>+ 
>+ blargg_err_t Gzip_File_Reader::seek_v( int n )
>+@@ -749,7 +749,7 @@ blargg_err_t Gzip_File_Reader::seek_v( i
>+ 	if ( gzseek( (gzFile)file_, n, SEEK_SET ) < 0 )
>+ 		return convert_gz_error( (gzFile)file_ );
>+ 
>+-	return blargg_ok;
>++	return (char*)blargg_ok;
>+ }
>+ 
>+ void Gzip_File_Reader::close()
>
>Property changes on: files/patch-fex_fex-Data_Reader.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-fex_fex-Data_Reader.h
>===================================================================
>--- files/patch-fex_fex-Data_Reader.h	(nonexistent)
>+++ files/patch-fex_fex-Data_Reader.h	(working copy)
>@@ -0,0 +1,20 @@
>+--- fex/fex/Data_Reader.h.orig	2019-02-11 01:08:33 UTC
>++++ fex/fex/Data_Reader.h
>+@@ -50,7 +50,7 @@ protected:
>+ 	
>+ 	// Do same as read(). Guaranteed that 0 < n <= remain(). Value of remain() is updated
>+ 	// AFTER this call succeeds, not before. set_remain() should NOT be called from this.
>+-	virtual blargg_err_t read_v( void*, int n )     BLARGG_PURE( { (void)n; return blargg_ok; } )
>++	virtual blargg_err_t read_v( void*, int n )     BLARGG_PURE( { (void)n; return (char*)blargg_ok; } )
>+ 	
>+ 	// Do same as skip(). Guaranteed that 0 < n <= remain(). Default just reads data
>+ 	// and discards it. Value of remain() is updated AFTER this call succeeds, not
>+@@ -90,7 +90,7 @@ protected:
>+ 	
>+ 	// Do same as seek(). Guaranteed that 0 <= n <= size().  Value of tell() is updated
>+ 	// AFTER this call succeeds, not before. set_* functions should NOT be called from this.
>+-	virtual blargg_err_t seek_v( int n ) BLARGG_PURE( { (void)n; return blargg_ok; } )
>++	virtual blargg_err_t seek_v( int n ) BLARGG_PURE( { (void)n; return (char*)blargg_ok; } )
>+ 	
>+ // Implementation
>+ protected:
>
>Property changes on: files/patch-fex_fex-Data_Reader.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+Author Date Id Rev URL
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-fex_fex-File_Extractor.cpp
>===================================================================
>--- files/patch-fex_fex-File_Extractor.cpp	(nonexistent)
>+++ files/patch-fex_fex-File_Extractor.cpp	(working copy)
>@@ -0,0 +1,65 @@
>+--- fex/fex/File_Extractor.cpp.orig	2019-02-11 01:21:21 UTC
>++++ fex/fex/File_Extractor.cpp
>+@@ -32,7 +32,7 @@ blargg_err_t File_Extractor::set_path( c
>+ 	
>+ 	RETURN_ERR( path_.resize( strlen( path ) + 1 ) );
>+ 	memcpy( path_.begin(), path, path_.size() );
>+-	return blargg_ok;
>++	return (char*)blargg_ok;
>+ }
>+ 
>+ blargg_err_t File_Extractor::open( const char path [] )
>+@@ -70,7 +70,7 @@ static void make_unbuffered( void* )
>+ blargg_err_t File_Extractor::open_arc_file( bool unbuffered )
>+ {
>+ 	if ( reader_ )
>+-		return blargg_ok;
>++		return (char*)blargg_ok;
>+ 	
>+ 	FEX_FILE_READER* in = BLARGG_NEW FEX_FILE_READER;
>+ 	CHECK_ALLOC( in );
>+@@ -208,7 +208,7 @@ blargg_err_t File_Extractor::stat()
>+ 		RETURN_ERR( stat_v() );
>+ 		stat_called = true;
>+ 	}
>+-	return blargg_ok;
>++	return (char*)blargg_ok;
>+ }
>+ 
>+ // Tell/seek
>+@@ -263,7 +263,7 @@ blargg_err_t File_Extractor::seek_arc_v(
>+ 	
>+ 	assert( tell_ == pos );
>+ 	
>+-	return blargg_ok;
>++	return (char*)blargg_ok;
>+ }
>+ 
>+ // Extraction
>+@@ -285,7 +285,7 @@ blargg_err_t File_Extractor::rewind_file
>+ 		}
>+ 	}
>+ 	
>+-	return blargg_ok;
>++	return (char*)blargg_ok;
>+ }
>+ 
>+ blargg_err_t File_Extractor::data( const void** data_out )
>+@@ -308,7 +308,7 @@ blargg_err_t File_Extractor::data( const
>+ 	}
>+ 	
>+ 	*data_out = data_ptr_;
>+-	return blargg_ok;
>++	return (char*)blargg_ok;
>+ }
>+ 
>+ blargg_err_t File_Extractor::data_v( void const** out )
>+@@ -329,7 +329,7 @@ blargg_err_t File_Extractor::extract_v( 
>+ 	RETURN_ERR( data( &p ) );
>+ 	memcpy( out, STATIC_CAST(char const*,p) + (size() - remain()), count );
>+ 	
>+-	return blargg_ok;
>++	return (char*)blargg_ok;
>+ }
>+ 
>+ blargg_err_t File_Extractor::read_v( void* out, int count )
>
>Property changes on: files/patch-fex_fex-File_Extractor.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-fex_fex-File_Extractor.h
>===================================================================
>--- files/patch-fex_fex-File_Extractor.h	(nonexistent)
>+++ files/patch-fex_fex-File_Extractor.h	(working copy)
>@@ -0,0 +1,24 @@
>+--- fex/fex/File_Extractor.h.orig	2019-02-11 00:54:17 UTC
>++++ fex/fex/File_Extractor.h
>+@@ -104,7 +104,7 @@ protected:
>+ 	virtual void         clear_file_v()             { }
>+ 	
>+ 	// Call set_info() if not already called by next_v()
>+-	virtual blargg_err_t stat_v()                   { return blargg_ok; }
>++	virtual blargg_err_t stat_v()                   { return (char*)blargg_ok; }
>+ 	
>+ 	// Return value that allows later return to this file. Result must be >= 0.
>+ 	virtual fex_pos_t tell_arc_v() const;
>+@@ -176,9 +176,9 @@ extern const fex_type_t_
>+ 	fex_zip_type [1],
>+ 	fex_bin_type [1];
>+ 
>+-inline blargg_err_t File_Extractor::open_v()    { return blargg_ok; }
>+-inline blargg_err_t File_Extractor::next_v()    { return blargg_ok; }
>+-inline blargg_err_t File_Extractor::rewind_v()  { return blargg_ok; }
>++inline blargg_err_t File_Extractor::open_v()    { return (char*)blargg_ok; }
>++inline blargg_err_t File_Extractor::next_v()    { return (char*)blargg_ok; }
>++inline blargg_err_t File_Extractor::rewind_v()  { return (char*)blargg_ok; }
>+ inline void         File_Extractor::close_v()   { }
>+ 
>+ // Default to Std_File_Reader for archive access
>
>Property changes on: files/patch-fex_fex-File_Extractor.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+Author Date Id Rev URL
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-fex_fex-Gzip_Extractor.cpp
>===================================================================
>--- files/patch-fex_fex-Gzip_Extractor.cpp	(nonexistent)
>+++ files/patch-fex_fex-Gzip_Extractor.cpp	(working copy)
>@@ -0,0 +1,45 @@
>+--- fex/fex/Gzip_Extractor.cpp.orig	2019-02-11 01:19:54 UTC
>++++ fex/fex/Gzip_Extractor.cpp
>+@@ -20,7 +20,7 @@ Inc., 51 Franklin Street, Fifth Floor, B
>+ static blargg_err_t init_gzip_file()
>+ {
>+ 	get_crc_table(); // initialize zlib's CRC-32 tables
>+-	return blargg_ok;
>++	return (char*)blargg_ok;
>+ }
>+ 
>+ static File_Extractor* new_gzip()
>+@@ -57,7 +57,7 @@ blargg_err_t Gzip_Extractor::stat_v()
>+ 		RETURN_ERR( gr.open( &arc() ) );
>+ 	
>+ 	set_info( gr.remain(), 0, gr.crc32() );
>+-	return blargg_ok;
>++	return (char*)blargg_ok;
>+ }
>+ 
>+ blargg_err_t Gzip_Extractor::open_v()
>+@@ -72,7 +72,7 @@ blargg_err_t Gzip_Extractor::open_v()
>+ 	name [name.size() - 1] = '\0';
>+ 	
>+ 	set_name( name.begin() );
>+-	return blargg_ok;
>++	return (char*)blargg_ok;
>+ }
>+ 
>+ void Gzip_Extractor::close_v()
>+@@ -83,13 +83,13 @@ void Gzip_Extractor::close_v()
>+ 
>+ blargg_err_t Gzip_Extractor::next_v()
>+ {
>+-	return blargg_ok;
>++	return (char*)blargg_ok;
>+ }
>+ 
>+ blargg_err_t Gzip_Extractor::rewind_v()
>+ {
>+ 	set_name( name.begin() );
>+-	return blargg_ok;
>++	return (char*)blargg_ok;
>+ }
>+ 
>+ blargg_err_t Gzip_Extractor::extract_v( void* p, int n )
>
>Property changes on: files/patch-fex_fex-Gzip_Extractor.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-fex_fex-Gzip_Reader.cpp
>===================================================================
>--- files/patch-fex_fex-Gzip_Reader.cpp	(nonexistent)
>+++ files/patch-fex_fex-Gzip_Reader.cpp	(working copy)
>@@ -0,0 +1,27 @@
>+--- fex/fex/Gzip_Reader.cpp.orig	2019-02-11 01:38:50 UTC
>++++ fex/fex/Gzip_Reader.cpp
>+@@ -49,7 +49,7 @@ blargg_err_t Gzip_Reader::calc_size()
>+ 		
>+ 		size_ = n;
>+ 	}
>+-	return blargg_ok;
>++	return (char*)blargg_ok;
>+ }
>+ 
>+ blargg_err_t Gzip_Reader::open( File_Reader* new_in )
>+@@ -63,7 +63,7 @@ blargg_err_t Gzip_Reader::open( File_Rea
>+ 	RETURN_ERR( calc_size() );
>+ 	set_remain( size_ );
>+ 	
>+-	return blargg_ok;
>++	return (char*)blargg_ok;
>+ }
>+ 
>+ void Gzip_Reader::close()
>+@@ -81,5 +81,5 @@ blargg_err_t Gzip_Reader::read_v( void* 
>+ 	if ( actual != count )
>+ 		return blargg_err_file_corrupt;
>+ 	
>+-	return blargg_ok;
>++	return (char*)blargg_ok;
>+ }
>
>Property changes on: files/patch-fex_fex-Gzip_Reader.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-fex_fex-Zip7_Extractor.cpp
>===================================================================
>--- files/patch-fex_fex-Zip7_Extractor.cpp	(nonexistent)
>+++ files/patch-fex_fex-Zip7_Extractor.cpp	(working copy)
>@@ -0,0 +1,36 @@
>+--- fex/fex/Zip7_Extractor.cpp.orig	2019-02-11 01:38:28 UTC
>++++ fex/fex/Zip7_Extractor.cpp
>+@@ -108,7 +108,7 @@ blargg_err_t Zip7_Extractor::zip7_err( i
>+ 	
>+ 	switch ( err )
>+ 	{
>+-	case SZ_OK:                 return blargg_ok;
>++	case SZ_OK:                 return (char*)blargg_ok;
>+ 	case SZ_ERROR_MEM:          return blargg_err_memory;
>+ 	case SZ_ERROR_READ:         return blargg_err_file_io;
>+ 	case SZ_ERROR_CRC:
>+@@ -130,7 +130,7 @@ static blargg_err_t init_7z()
>+ 		inited = true;
>+ 		CrcGenerateTable();
>+ 	}
>+-	return blargg_ok;
>++	return (char*)blargg_ok;
>+ }
>+ 
>+ static File_Extractor* new_7z()
>+@@ -318,7 +318,7 @@ blargg_err_t Zip7_Extractor::next_v()
>+ 		}
>+ 	}
>+ 	
>+-	return blargg_ok;
>++	return (char*)blargg_ok;
>+ }
>+ 
>+ blargg_err_t Zip7_Extractor::rewind_v()
>+@@ -350,5 +350,5 @@ blargg_err_t Zip7_Extractor::data_v( voi
>+ 	assert( count == (size_t) size() );
>+ 	
>+ 	*out = impl->buf + offset;
>+-	return blargg_ok;
>++	return (char*)blargg_ok;
>+ }
>
>Property changes on: files/patch-fex_fex-Zip7_Extractor.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-fex_fex-Zip_Extractor.cpp
>===================================================================
>--- files/patch-fex_fex-Zip_Extractor.cpp	(nonexistent)
>+++ files/patch-fex_fex-Zip_Extractor.cpp	(working copy)
>@@ -0,0 +1,27 @@
>+--- fex/fex/Zip_Extractor.cpp.orig	2019-02-11 01:39:11 UTC
>++++ fex/fex/Zip_Extractor.cpp
>+@@ -92,7 +92,7 @@ int const end_entry_size = 22;
>+ static blargg_err_t init_zip()
>+ {
>+ 	get_crc_table(); // initialize zlib's CRC-32 tables
>+-	return blargg_ok;
>++	return (char*)blargg_ok;
>+ }
>+ 
>+ static File_Extractor* new_zip()
>+@@ -261,7 +261,7 @@ blargg_err_t Zip_Extractor::update_info(
>+ 		advance_first = false;
>+ 	}
>+ 	
>+-	return blargg_ok;
>++	return (char*)blargg_ok;
>+ }
>+ 
>+ blargg_err_t Zip_Extractor::next_v()
>+@@ -386,5 +386,5 @@ blargg_err_t Zip_Extractor::extract_v( v
>+ 	if ( count == reader().remain() && crc != correct_crc )
>+ 		return blargg_err_file_corrupt;
>+ 	
>+-	return blargg_ok;
>++	return (char*)blargg_ok;
>+ }
>
>Property changes on: files/patch-fex_fex-Zip_Extractor.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-fex_fex-Zlib_Inflater.cpp
>===================================================================
>--- files/patch-fex_fex-Zlib_Inflater.cpp	(nonexistent)
>+++ files/patch-fex_fex-Zlib_Inflater.cpp	(working copy)
>@@ -0,0 +1,27 @@
>+--- fex/fex/Zlib_Inflater.cpp.orig	2019-02-11 01:43:31 UTC
>++++ fex/fex/Zlib_Inflater.cpp
>+@@ -65,7 +65,7 @@ blargg_err_t Zlib_Inflater::fill_buf( in
>+ 	RETURN_ERR( callback( user_data, out, &count ) );
>+ 	zbuf.avail_in = count;
>+ 	zbuf.next_in  = out;
>+-	return blargg_ok;
>++	return (char*)blargg_ok;
>+ }
>+ 
>+ blargg_err_t Zlib_Inflater::begin( callback_t new_callback, void* new_user_data,
>+@@ -125,7 +125,7 @@ blargg_err_t Zlib_Inflater::set_mode( mo
>+ 
>+ 		deflated_ = true;
>+ 	}
>+-	return blargg_ok;
>++	return (char*)blargg_ok;
>+ }
>+ 
>+ /*
>+@@ -253,5 +253,5 @@ blargg_err_t Zlib_Inflater::read( void* 
>+ 		}
>+ 	}
>+ 	*count_io -= remain;
>+-	return blargg_ok;
>++	return (char*)blargg_ok;
>+ }
>
>Property changes on: files/patch-fex_fex-Zlib_Inflater.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-fex_fex-blargg_common.cpp
>===================================================================
>--- files/patch-fex_fex-blargg_common.cpp	(nonexistent)
>+++ files/patch-fex_fex-blargg_common.cpp	(working copy)
>@@ -0,0 +1,9 @@
>+--- fex/fex/blargg_common.cpp.orig	2019-02-11 00:53:32 UTC
>++++ fex/fex/blargg_common.cpp
>+@@ -47,5 +47,5 @@ blargg_err_t blargg_vector_::resize_( si
>+ 			size_  = n;
>+ 		}
>+ 	}
>+-	return blargg_ok;
>++	return (char*)blargg_ok;
>+ }
>
>Property changes on: files/patch-fex_fex-blargg_common.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-fex_fex-blargg_errors.cpp
>===================================================================
>--- files/patch-fex_fex-blargg_errors.cpp	(nonexistent)
>+++ files/patch-fex_fex-blargg_errors.cpp	(working copy)
>@@ -0,0 +1,11 @@
>+--- fex/fex/blargg_errors.cpp.orig	2019-02-11 00:53:44 UTC
>++++ fex/fex/blargg_errors.cpp
>+@@ -101,7 +101,7 @@ int blargg_err_to_code( blargg_err_t err
>+ blargg_err_t blargg_code_to_err( int code, blargg_err_to_code_t const codes [] )
>+ {
>+ 	if ( !code )
>+-		return blargg_ok;
>++		return (char*)blargg_ok;
>+ 	
>+ 	while ( codes->str && codes->code != code )
>+ 		codes++;
>
>Property changes on: files/patch-fex_fex-blargg_errors.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-fex_fex-fex.cpp
>===================================================================
>--- files/patch-fex_fex-fex.cpp	(nonexistent)
>+++ files/patch-fex_fex-fex.cpp	(working copy)
>@@ -0,0 +1,38 @@
>+--- fex/fex/fex.cpp.orig	2019-02-11 01:08:44 UTC
>++++ fex/fex/fex.cpp
>+@@ -57,7 +57,7 @@ BLARGG_EXPORT fex_err_t fex_init( void )
>+ 		}
>+ 		inited = true;
>+ 	}
>+-	return blargg_ok;
>++	return (char*)blargg_ok;
>+ }
>+ 
>+ BLARGG_EXPORT const char* fex_identify_header( void const* header )
>+@@ -180,7 +180,7 @@ BLARGG_EXPORT fex_err_t fex_identify_fil
>+ 	
>+ 	// Unsupported extension?
>+ 	if ( !type )
>+-		return blargg_ok; // reject
>++		return (char*)blargg_ok; // reject
>+ 	
>+ 	// Unknown/no extension?
>+ 	if ( !*(type->extension) )
>+@@ -198,7 +198,7 @@ BLARGG_EXPORT fex_err_t fex_identify_fil
>+ 	}
>+ 	
>+ 	*type_out = type;
>+-	return blargg_ok;
>++	return (char*)blargg_ok;
>+ }
>+ 
>+ BLARGG_EXPORT fex_err_t fex_open_type( fex_t** fe_out, const char path [], fex_type_t type )
>+@@ -219,7 +219,7 @@ BLARGG_EXPORT fex_err_t fex_open_type( f
>+ 	}
>+ 	
>+ 	*fe_out = fe;
>+-	return blargg_ok;
>++	return (char*)blargg_ok;
>+ }
>+ 
>+ BLARGG_EXPORT fex_err_t fex_open( fex_t** fe_out, const char path [] )
>
>Property changes on: files/patch-fex_fex-fex.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-src_gba-Cheats_cpp
>===================================================================
>--- files/patch-src_gba-Cheats_cpp	(nonexistent)
>+++ files/patch-src_gba-Cheats_cpp	(working copy)
>@@ -0,0 +1,21 @@
>+--- src/gba/Cheats.cpp.orig	2019-02-11 00:20:02 UTC
>++++ src/gba/Cheats.cpp
>+@@ -2477,12 +2477,12 @@ void cheatsAddCBACode(const char *code, 
>+   sscanf(buffer, "%x", &value);
>+ 
>+   u8 array[8] = {
>+-    address & 255,
>+-    (address >> 8) & 255,
>+-    (address >> 16) & 255,
>+-    (address >> 24) & 255,
>+-    (value & 255),
>+-    (value >> 8) & 255,
>++    static_cast<u8>(address & 55),
>++    static_cast<u8>((address >> 8) & 255),
>++    static_cast<u8>((address >> 16) & 255),
>++    static_cast<u8>((address >> 24) & 255),
>++    static_cast<u8>((value & 255)),
>++    static_cast<u8>((value >> 8) & 255),
>+     0,
>+     0
>+   };
>
>Property changes on: files/patch-src_gba-Cheats_cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 223538: 187908 | 201911