Mercurial > libdvdnav.hg
changeset 107:b2801805c433 src
include some fixes done in xine's copy to avoid merging conflicts
| author | mroi |
|---|---|
| date | Thu, 24 Oct 2002 16:48:19 +0000 |
| parents | e984044bbe7b |
| children | 293bb1798e86 |
| files | dvdnav_internal.h.in read_cache.c |
| diffstat | 2 files changed, 16 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/dvdnav_internal.h.in Wed Oct 23 11:38:09 2002 +0000 +++ b/dvdnav_internal.h.in Thu Oct 24 16:48:19 2002 +0000 @@ -160,7 +160,11 @@ /** USEFUL MACROS **/ +#ifdef __GNUC__ #define printerrf(format, args...) snprintf(this->err_str, MAX_ERR_LEN, format, ## args); +#else +#define printerrf(...) snprintf(this->err_str, MAX_ERR_LEN, __VA_ARGS__); +#endif #define printerr(str) strncpy(this->err_str, str, MAX_ERR_LEN); /* Save my typing */
--- a/read_cache.c Wed Oct 23 11:38:09 2002 +0000 +++ b/read_cache.c Thu Oct 24 16:48:19 2002 +0000 @@ -103,10 +103,19 @@ /* #define READ_CACHE_TRACE 0 */ -#if READ_CACHE_TRACE -#define dprintf(fmt, args...) fprintf(MSG_OUT, "libdvdnav: %s: "fmt, __func__ , ## args); + +#ifdef __GNUC__ +# if READ_CACHE_TRACE +# define dprintf(fmt, args...) fprintf(MSG_OUT, "libdvdnav: %s: "fmt, __func__ , ## arg +# else +# define dprintf(fmt, args...) /* Nowt */ +# endif #else -#define dprintf(fmt, args...) /* Nowt */ +# if READ_CACHE_TRACE +# define dprintf(fmt, ...) fprintf(MSG_OUT, "libdvdnav: %s: "fmt, __func__ , __VA_ARGS_ +# else +# define dprintf(fmt, ...) /* Nowt */ +# endif #endif #if _MULTITHREAD_