Commit 9522bf4f authored by Jean-Paul Saman's avatar Jean-Paul Saman

src/dvbpsi_private.h: Fix building with HAVE_VARIADIC_MACROS.

parent ddda1724
...@@ -42,7 +42,7 @@ extern "C" { ...@@ -42,7 +42,7 @@ extern "C" {
#endif #endif
/***************************************************************************** /*****************************************************************************
* dvbpsi_handle * dvbpsi_t
*****************************************************************************/ *****************************************************************************/
/*! /*!
* \typedef struct dvbpsi_s dvbpsi_t * \typedef struct dvbpsi_s dvbpsi_t
...@@ -66,7 +66,7 @@ typedef enum dvbpsi_msg_level ...@@ -66,7 +66,7 @@ typedef enum dvbpsi_msg_level
* dvbpsi_message_cb * dvbpsi_message_cb
*****************************************************************************/ *****************************************************************************/
/*! /*!
* \typedef void (* dvbpsi_message_cb)(dvbpsi_handle p_decoder, * \typedef void (* dvbpsi_message_cb)(dvbpsi_t *p_decoder,
* const dvbpse_msg_level_t level, * const dvbpse_msg_level_t level,
* const char* msg) * const char* msg)
* \brief Callback type definition. * \brief Callback type definition.
......
...@@ -40,14 +40,14 @@ extern uint32_t dvbpsi_crc32_table[]; ...@@ -40,14 +40,14 @@ extern uint32_t dvbpsi_crc32_table[];
*****************************************************************************/ *****************************************************************************/
#ifdef HAVE_VARIADIC_MACROS #ifdef HAVE_VARIADIC_MACROS
void message(dvbpsi_handle dvbpsi, const int level, const char *fmt, ...); void message(dvbpsi_t *dvbpsi, const int level, const char *fmt, ...);
# define dvbpsi_error(hnd, src, str, x...) \ # define dvbpsi_error(hnd, src, str, x...) \
message(hnd, DVBPSI_MSG_ERROR, "libdvbpsi error ("src"): " str, x) message(hnd, DVBPSI_MSG_ERROR, "libdvbpsi error ("src"): " str, ##x)
# define dvbpsi_warning(hnd, str, x...) \ # define dvbpsi_warning(hnd, src, str, x...) \
message(hnd, DVBPSI_MSG_WARNING, "libdvbpsi warning ("src"): " str, x) message(hnd, DVBPSI_MSG_WARNING, "libdvbpsi warning ("src"): " str, ##x)
# define dvbpsi_debug(hnd, str, x...) \ # define dvbpsi_debug(hnd, src, str, x...) \
message(hnd, DVBPSI_MSG_DEBUG, "libdvbpsi debug ("src"): " str, x) message(hnd, DVBPSI_MSG_DEBUG, "libdvbpsi debug ("src"): " str, ##x)
#else #else
void dvbpsi_error(dvbpsi_t *dvbpsi, const char *src, const char *fmt, ...); void dvbpsi_error(dvbpsi_t *dvbpsi, const char *src, const char *fmt, ...);
void dvbpsi_warning(dvbpsi_t *dvbpsi, const char *src, const char *fmt, ...); void dvbpsi_warning(dvbpsi_t *dvbpsi, const char *src, const char *fmt, ...);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment