mirror of
https://github.com/irssi/irssi.git
synced 2024-12-04 14:46:39 -05:00
Merge pull request #1182 from ailin-nemui/cleanup
remove some old compat code
This commit is contained in:
commit
d2291ec6eb
@ -32,22 +32,7 @@ void printtext_deinit(void);
|
|||||||
|
|
||||||
/* printformat(...) = printformat_format(MODULE_NAME, ...)
|
/* printformat(...) = printformat_format(MODULE_NAME, ...)
|
||||||
|
|
||||||
Could this be any harder? :) With GNU C compiler and C99 compilers,
|
Irssi requires a C99 pre-processor with __VA_ARGS__ support */
|
||||||
use #define. With others use either inline functions if they are
|
|
||||||
supported or static functions if they are not..
|
|
||||||
*/
|
|
||||||
#if defined (__GNUC__) && !defined (__STRICT_ANSI__)
|
|
||||||
/* GCC */
|
|
||||||
# define printformat(server, target, level, formatnum...) \
|
|
||||||
printformat_module(MODULE_NAME, server, target, level, ##formatnum)
|
|
||||||
# define printformat_window(window, level, formatnum...) \
|
|
||||||
printformat_module_window(MODULE_NAME, window, level, ##formatnum)
|
|
||||||
# define printformat_dest(dest, formatnum...) \
|
|
||||||
printformat_module_dest(MODULE_NAME, dest, ##formatnum)
|
|
||||||
# define printformat_gui(formatnum...) \
|
|
||||||
printformat_module_gui(MODULE_NAME, ##formatnum)
|
|
||||||
#elif __STDC_VERSION__ >= 199901L
|
|
||||||
/* C99 */
|
|
||||||
# define printformat(server, target, level, formatnum, ...) \
|
# define printformat(server, target, level, formatnum, ...) \
|
||||||
printformat_module(MODULE_NAME, server, target, level, formatnum, ##__VA_ARGS__)
|
printformat_module(MODULE_NAME, server, target, level, formatnum, ##__VA_ARGS__)
|
||||||
# define printformat_window(window, level, formatnum, ...) \
|
# define printformat_window(window, level, formatnum, ...) \
|
||||||
@ -56,63 +41,5 @@ void printtext_deinit(void);
|
|||||||
printformat_module_dest(MODULE_NAME, dest, formatnum, ##__VA_ARGS__)
|
printformat_module_dest(MODULE_NAME, dest, formatnum, ##__VA_ARGS__)
|
||||||
# define printformat_gui(formatnum, ...) \
|
# define printformat_gui(formatnum, ...) \
|
||||||
printformat_module_gui(MODULE_NAME, formatnum, ##__VA_ARGS__)
|
printformat_module_gui(MODULE_NAME, formatnum, ##__VA_ARGS__)
|
||||||
#else
|
|
||||||
/* inline/static */
|
|
||||||
#ifdef G_CAN_INLINE
|
|
||||||
G_INLINE_FUNC
|
|
||||||
#else
|
|
||||||
static
|
|
||||||
#endif
|
|
||||||
void printformat(void *server, const char *target, int level, int formatnum, ...)
|
|
||||||
{
|
|
||||||
va_list va;
|
|
||||||
|
|
||||||
va_start(va, formatnum);
|
|
||||||
printformat_module_args(MODULE_NAME, server, target, level, formatnum, va);
|
|
||||||
va_end(va);
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef G_CAN_INLINE
|
|
||||||
G_INLINE_FUNC
|
|
||||||
#else
|
|
||||||
static
|
|
||||||
#endif
|
|
||||||
void printformat_window(WINDOW_REC *window, int level, int formatnum, ...)
|
|
||||||
{
|
|
||||||
va_list va;
|
|
||||||
|
|
||||||
va_start(va, formatnum);
|
|
||||||
printformat_module_window_args(MODULE_NAME, window, level, formatnum, va);
|
|
||||||
va_end(va);
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef G_CAN_INLINE
|
|
||||||
G_INLINE_FUNC
|
|
||||||
#else
|
|
||||||
static
|
|
||||||
#endif
|
|
||||||
void printformat_dest(TEXT_DEST_REC *dest, int formatnum, ...)
|
|
||||||
{
|
|
||||||
va_list va;
|
|
||||||
|
|
||||||
va_start(va, formatnum);
|
|
||||||
printformat_module_dest_args(MODULE_NAME, dest, formatnum, va);
|
|
||||||
va_end(va);
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef G_CAN_INLINE
|
|
||||||
G_INLINE_FUNC
|
|
||||||
#else
|
|
||||||
static
|
|
||||||
#endif
|
|
||||||
void printformat_gui(int formatnum, ...)
|
|
||||||
{
|
|
||||||
va_list va;
|
|
||||||
|
|
||||||
va_start(va, formatnum);
|
|
||||||
printformat_module_gui_args(MODULE_NAME, formatnum, va);
|
|
||||||
va_end(va);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user