+1 is better than the alternative.
This commit is contained in:
parent
3665e11f83
commit
a42b847c56
|
@ -70,51 +70,27 @@ struct string_list *file_list;
|
||||||
static const char* IMAGE_CORE_PREFIX(valid_extensions) = "jpg|jpeg|png|bmp|psd|tga|gif|hdr|pic|ppm|pgm";
|
static const char* IMAGE_CORE_PREFIX(valid_extensions) = "jpg|jpeg|png|bmp|psd|tga|gif|hdr|pic|ppm|pgm";
|
||||||
#else
|
#else
|
||||||
|
|
||||||
static const char* IMAGE_CORE_PREFIX(valid_extensions) =
|
static const char* IMAGE_CORE_PREFIX(valid_extensions) = 1+ /* to remove the first |, the alternative is 25 extra lines of ifdef/etc */
|
||||||
|
|
||||||
#undef SEPARATOR
|
|
||||||
|
|
||||||
#ifdef HAVE_RJPEG
|
#ifdef HAVE_RJPEG
|
||||||
# ifndef SEPARATOR
|
"|jpg|jpeg"
|
||||||
# define SEPARATOR
|
|
||||||
# else
|
|
||||||
"|"
|
|
||||||
# endif
|
|
||||||
"jpg|jpeg"
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_RPNG
|
#ifdef HAVE_RPNG
|
||||||
# ifndef SEPARATOR
|
"|png"
|
||||||
# define SEPARATOR
|
|
||||||
# else
|
|
||||||
"|"
|
|
||||||
# endif
|
|
||||||
"png"
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_RBMP
|
#ifdef HAVE_RBMP
|
||||||
# ifndef SEPARATOR
|
"|bmp"
|
||||||
# define SEPARATOR
|
|
||||||
# else
|
|
||||||
"|"
|
|
||||||
# endif
|
|
||||||
"bmp"
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_RTGA
|
#ifdef HAVE_RTGA
|
||||||
# ifndef SEPARATOR
|
"|tga"
|
||||||
# define SEPARATOR
|
|
||||||
# else
|
|
||||||
"|"
|
|
||||||
# endif
|
|
||||||
"tga"
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef SEPARATOR
|
#if !defined(HAVE_RJPEG) && !defined(HAVE_RPNG) && !defined(HAVE_RBMP) && !defined(HAVE_RTGA)
|
||||||
#error "can't build this core with no image formats"
|
#error "can't build this core with no image formats"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#undef SEPARATOR
|
|
||||||
;
|
;
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue