Merge pull request #2224 from leiradel/master

fix function signatures; fix license on jsonsax
This commit is contained in:
Twinaphex 2015-10-09 18:53:03 +02:00
commit 36b4f21a40
4 changed files with 8 additions and 8 deletions

View File

@ -1021,7 +1021,7 @@ static void test_cheevo_set( const cheevoset_t* set )
}
}
void cheevos_test( int unofficial )
void cheevos_test( void )
{
#ifdef HAVE_SMW_CHEEVOS
static int init = 1;
@ -1076,7 +1076,7 @@ static void free_cheevo_set( const cheevoset_t* set )
free( (void*)set->cheevos );
}
void cheevos_unload()
void cheevos_unload( void )
{
free_cheevo_set( &core_cheevos );
free_cheevo_set( &unofficial_cheevos );
@ -1089,11 +1089,11 @@ int cheevos_load( const char* json )
return -1;
}
void cheevos_test()
void cheevos_test( void )
{
}
void cheevos_unload()
void cheevos_unload( void )
{
}

View File

@ -27,7 +27,7 @@ cheevos_config_t;
extern cheevos_config_t cheevos_config;
int cheevos_load( const char* json );
void cheevos_test();
void cheevos_unload();
void cheevos_test( void );
void cheevos_unload( void );
#endif /* __RARCH_CHEEVOS_H */

View File

@ -1,7 +1,7 @@
/* Copyright (C) 2010-2015 The RetroArch team
*
* ---------------------------------------------------------------------------------------
* The following license statement only applies to this file (rxml.c).
* The following license statement only applies to this file (jsonsax.c).
* ---------------------------------------------------------------------------------------
*
* Permission is hereby granted, free of charge,

View File

@ -1,7 +1,7 @@
/* Copyright (C) 2010-2015 The RetroArch team
*
* ---------------------------------------------------------------------------------------
* The following license statement only applies to this file (rxml.h).
* The following license statement only applies to this file (jsonsax.h).
* ---------------------------------------------------------------------------------------
*
* Permission is hereby granted, free of charge,