summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-04-07 21:21:35 +0200
committerDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-04-07 21:21:35 +0200
commit72502048605f35642f421bd256021dbd93482728 (patch)
tree71cba6df0416fc429171cef5b53f24057ef60275 /include
parent7fb0e4d32e5a7ccc121c42e043db795286e1a567 (diff)
parentb56784ba37622f28147b6a10c7ba77f9c9fbf2f7 (diff)
downloadxine-lib-72502048605f35642f421bd256021dbd93482728.tar.gz
xine-lib-72502048605f35642f421bd256021dbd93482728.tar.bz2
Merge changes from main repository.
Diffstat (limited to 'include')
-rw-r--r--include/xine.h.in11
1 files changed, 2 insertions, 9 deletions
diff --git a/include/xine.h.in b/include/xine.h.in
index e4210d314..f25038796 100644
--- a/include/xine.h.in
+++ b/include/xine.h.in
@@ -792,17 +792,10 @@ int xine_get_log_section_count(xine_t *self) XINE_PROTECTED;
const char *const *xine_get_log_names(xine_t *self) XINE_PROTECTED;
/* print some log information to <buf> section */
-#ifndef __GNUC__
void xine_log (xine_t *self, int buf,
- const char *format, ...) XINE_PROTECTED;
+ const char *format, ...) XINE_FORMAT_PRINTF(3, 4) XINE_PROTECTED;
void xine_vlog(xine_t *self, int buf,
- const char *format, va_list args) XINE_PROTECTED;
-#else
-void xine_log (xine_t *self, int buf,
- const char *format, ...) __attribute__ ((__format__(printf, 3, 4))) XINE_PROTECTED;
-void xine_vlog(xine_t *self, int buf,
- const char *format, va_list args) __attribute__ ((__format__(printf, 3, 0))) XINE_PROTECTED;
-#endif
+ const char *format, va_list args) XINE_FORMAT_PRINTF(3, 0) XINE_PROTECTED;
/* get log messages of specified section */
char *const *xine_get_log (xine_t *self, int buf) XINE_PROTECTED;