Merge pull request #9171 from orbea/clang

Silence -Wstring-plus-int with clang.
This commit is contained in:
Twinaphex 2019-07-22 22:02:18 +02:00 committed by GitHub
commit 286217394f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -72,7 +72,7 @@ static struct string_list *image_file_list;
static const char* IMAGE_CORE_PREFIX(valid_extensions) = "jpg|jpeg|png|bmp|psd|tga|gif|hdr|pic|ppm|pgm";
#else
static const char* IMAGE_CORE_PREFIX(valid_extensions) = 1+ /* to remove the first |, the alternative is 25 extra lines of ifdef/etc */
static const char image_formats[] =
#ifdef HAVE_RJPEG
"|jpg|jpeg"
@ -95,6 +95,9 @@ static const char* IMAGE_CORE_PREFIX(valid_extensions) = 1+ /* to remove the fir
#endif
;
/* to remove the first |, the alternative is 25 extra lines of ifdef/etc */
static const char* IMAGE_CORE_PREFIX(valid_extensions) = image_formats + 1;
#endif
void IMAGE_CORE_PREFIX(retro_get_system_info)(struct retro_system_info *info)