mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 06:44:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Themaister/SSNES into ssnes-consoles

Browse Source 
Conflicts:
	general.h
This commit is contained in:
Themaister 2011-12-02 21:18:09 +01:00
commit 457a3d458a
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
conf/config_file.c
View File

@ -22,11 +22,11 @@
#include <stdio.h> #include <stdio.h>
#include <ctype.h> #include <ctype.h>
#include <errno.h> #include <errno.h>
#include "strl.h" #include "../strl.h"
#ifndef _WIN32 #if !defined(_WIN32) && !defined(__CELLOS_LV2__)
#include <sys/param.h> // MAXPATHLEN #include <sys/param.h> // MAXPATHLEN
#else #elif defined(_WIN32)
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#endif #endif

7
file.c
View File

@ -756,7 +756,7 @@ static bool load_normal_rom(void)
if (!g_extern.rom_file) if (!g_extern.rom_file)
{ {
SSNES_ERR("Implementation requires a full path to be set, cannot load ROM from stdin. Aborting ...\n"); SSNES_ERR("Implementation requires a full path to be set, cannot load ROM from stdin. Aborting ...\n");
exit(1); return false;
} }
fclose(g_extern.rom_file); fclose(g_extern.rom_file);
@ -769,12 +769,11 @@ static bool load_normal_rom(void)
{ {
SSNES_ERR("ROM file is not valid!\n"); SSNES_ERR("ROM file is not valid!\n");
free(rom_buf); free(rom_buf);
free(xml_buf);
return false; return false;
} }
if (xml_buf) free(xml_buf);
free(xml_buf);
free(rom_buf); free(rom_buf);
return true; return true;
} }

6
general.h
View File

@ -46,11 +46,9 @@
#include "audio/hermite.h" #include "audio/hermite.h"
#if !defined(_WIN32) #if !defined(_WIN32) && !defined(__CELLOS_LV2__)
#if !defined(__CELLOS_LV2__)
#include <sys/param.h> // MAXPATHLEN #include <sys/param.h> // MAXPATHLEN
#endif #elif defined(_WIN32)
#else
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#endif #endif