From f6c7eade2b8853b3d525b5cc0402e89ca74c1908 Mon Sep 17 00:00:00 2001 From: Marcus Comstedt Date: Tue, 1 Jul 2014 00:07:40 +0200 Subject: Remove dependency on Python.h from public API header This prevents Python.h from being included into client code, where it can mess things up by e.g. redefining _POSIX_C_SOURCE. --- libsigrokdecode.h | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) (limited to 'libsigrokdecode.h') diff --git a/libsigrokdecode.h b/libsigrokdecode.h index 9d2dbd3..7f75ab2 100644 --- a/libsigrokdecode.h +++ b/libsigrokdecode.h @@ -22,7 +22,6 @@ #ifndef LIBSIGROKDECODE_SIGROKDECODE_H #define LIBSIGROKDECODE_SIGROKDECODE_H -#include /* First, so we avoid a _POSIX_C_SOURCE warning. */ #include #include @@ -184,10 +183,10 @@ struct srd_decoder { GSList *options; /** Python module. */ - PyObject *py_mod; + void *py_mod; /** sigrokdecode.Decoder class. */ - PyObject *py_dec; + void *py_dec; }; /** @@ -221,7 +220,7 @@ struct srd_decoder_annotation_row { struct srd_decoder_inst { struct srd_decoder *decoder; struct srd_session *sess; - PyObject *py_inst; + void *py_inst; char *inst_id; GSList *pd_output; int dec_num_channels; @@ -267,19 +266,6 @@ struct srd_pd_callback { void *cb_data; }; -/* Custom Python types: */ - -typedef struct { - PyObject_HEAD - struct srd_decoder_inst *di; - uint64_t start_samplenum; - unsigned int itercnt; - uint8_t *inbuf; - uint64_t inbuflen; - PyObject *sample; -} srd_logic; - - /* srd.c */ SRD_API int srd_init(const char *path); SRD_API int srd_exit(void); -- cgit v1.2.3-70-g09d2