X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=module_sigrokdecode.c;h=468a1cb0a7276c798a238edc1b262fc0255222b5;hb=41bab68212533f4697ad378af574e06ea83e4fd9;hp=557ad1ac8aa4d770d2e33164e08f744c7e91b158;hpb=50bd5d259677faf87bb3408e111d0e833d7ba9b4;p=libsigrokdecode.git
diff --git a/module_sigrokdecode.c b/module_sigrokdecode.c
index 557ad1a..468a1cb 100644
--- a/module_sigrokdecode.c
+++ b/module_sigrokdecode.c
@@ -17,9 +17,9 @@
* along with this program. If not, see .
*/
-#include "sigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
-#include "sigrokdecode-internal.h"
-#include "config.h"
+#include
+#include "libsigrokdecode-internal.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
+#include "libsigrokdecode.h"
/** @cond PRIVATE */
@@ -45,7 +45,6 @@ static struct PyModuleDef sigrokdecode_module = {
};
/** @cond PRIVATE */
-/* FIXME: SRD_PRIV causes issues on MinGW. Investigate. */
PyMODINIT_FUNC PyInit_sigrokdecode(void)
{
PyObject *mod;
@@ -69,14 +68,17 @@ PyMODINIT_FUNC PyInit_sigrokdecode(void)
(PyObject *)&srd_logic_type) == -1)
return NULL;
- /* expose output types as symbols in the sigrokdecode module */
+ /* Expose output types as symbols in the sigrokdecode module */
if (PyModule_AddIntConstant(mod, "OUTPUT_ANN", SRD_OUTPUT_ANN) == -1)
return NULL;
- if (PyModule_AddIntConstant(mod, "OUTPUT_PROTO",
- SRD_OUTPUT_PROTO) == -1)
+ if (PyModule_AddIntConstant(mod, "OUTPUT_PYTHON", SRD_OUTPUT_PYTHON) == -1)
return NULL;
- if (PyModule_AddIntConstant(mod, "OUTPUT_BINARY",
- SRD_OUTPUT_BINARY) == -1)
+ if (PyModule_AddIntConstant(mod, "OUTPUT_BINARY", SRD_OUTPUT_BINARY) == -1)
+ return NULL;
+ if (PyModule_AddIntConstant(mod, "OUTPUT_META", SRD_OUTPUT_META) == -1)
+ return NULL;
+ /* Expose meta input symbols. */
+ if (PyModule_AddIntConstant(mod, "SRD_CONF_SAMPLERATE", SRD_CONF_SAMPLERATE) == -1)
return NULL;
mod_sigrokdecode = mod;