X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=libsigrokdecode-internal.h;h=8259b97935a9de1c98a3619f14d8d6ebe68f77fe;hp=fa8e91c8d2348723a56945a553720f4d0ae1c9b3;hb=40589f25f90c4863cfe2787b72629aa0a8cda082;hpb=201a85a8ea071d37f4fda2668c0a1c488d852f4e diff --git a/libsigrokdecode-internal.h b/libsigrokdecode-internal.h index fa8e91c..8259b97 100644 --- a/libsigrokdecode-internal.h +++ b/libsigrokdecode-internal.h @@ -86,6 +86,9 @@ SRD_PRIV int srd_log(int loglevel, const char *format, ...) G_GNUC_PRINTF(2, 3); #define srd_warn(...) srd_log(SRD_LOG_WARN, __VA_ARGS__) #define srd_err(...) srd_log(SRD_LOG_ERR, __VA_ARGS__) +/* decoder.c */ +SRD_PRIV long srd_decoder_apiver(const struct srd_decoder *d); + /* type_decoder.c */ SRD_PRIV PyObject *srd_Decoder_type_new(void); @@ -96,12 +99,23 @@ SRD_PRIV PyObject *srd_logic_type_new(void); PyMODINIT_FUNC PyInit_sigrokdecode(void); /* util.c */ +SRD_PRIV PyObject *py_import_by_name(const char *name); SRD_PRIV int py_attr_as_str(PyObject *py_obj, const char *attr, char **outstr); SRD_PRIV int py_dictitem_as_str(PyObject *py_obj, const char *key, char **outstr); SRD_PRIV int py_str_as_str(PyObject *py_str, char **outstr); SRD_PRIV int py_strseq_to_char(PyObject *py_strseq, char ***out_strv); +SRD_PRIV GVariant *py_obj_to_variant(PyObject *py_obj); /* exception.c */ -SRD_PRIV void srd_exception_catch(const char *format, ...); +#if defined(G_OS_WIN32) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) +/* + * On MinGW, we need to specify the gnu_printf format flavor or GCC + * will assume non-standard Microsoft printf syntax. + */ +SRD_PRIV void srd_exception_catch(const char *format, ...) + __attribute__((__format__ (__gnu_printf__, 1, 2))); +#else +SRD_PRIV void srd_exception_catch(const char *format, ...) G_GNUC_PRINTF(1, 2); +#endif #endif