It now builds on Ubuntu 18.10 'cosmic' as well!
It builds now! (on trusty..., working on cosmic next) 1st draft of using df Changed disk monitoring mode to enum draft install & download accounting Draft backup added DBG small fixes fixing backup accounting New debugging Better debugging MyDebug is not an Object Hotfix for backing up OS with sapces in name 3.2.3 Testing ESC key Added idle/cont fixing uncompressed size Remove focus setting from wifi dialog Fix zip files for ichigojam Fix debug MSG Different ESC implementation from menu Amend write image size Shortcut for edit configs Prevent firmware downgrade p3.2.4 Add option shortcuts p3.2.4a Added gpiochannel and gpiochannelValue to init
This commit is contained in:
@@ -1,49 +0,0 @@
|
||||
sqlite3: fix build when threads are not used/available
|
||||
|
||||
When threads are not used/available, a function in the sqlite3 extension
|
||||
ends up with a label at the end:
|
||||
|
||||
void _pysqlite_final_callback(sqlite3_context* context)
|
||||
{
|
||||
PyObject* function_result;
|
||||
PyObject** aggregate_instance;
|
||||
int ok;
|
||||
|
||||
#ifdef WITH_THREAD
|
||||
PyGILState_STATE threadstate;
|
||||
|
||||
threadstate = PyGILState_Ensure();
|
||||
#endif
|
||||
|
||||
aggregate_instance = (PyObject**)sqlite3_aggregate_context(context, sizeof(PyObject*));
|
||||
if (!*aggregate_instance) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
[......]
|
||||
|
||||
error:
|
||||
#ifdef WITH_THREAD
|
||||
PyGILState_Release(threadstate);
|
||||
#endif
|
||||
}
|
||||
|
||||
This is not valid, and gcc complains.
|
||||
|
||||
Fix that by adding a dummy statement after the label, so that the label
|
||||
is never the last statement of the function.
|
||||
|
||||
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
|
||||
Index: b/Modules/_sqlite/connection.c
|
||||
===================================================================
|
||||
--- a/Modules/_sqlite/connection.c
|
||||
+++ b/Modules/_sqlite/connection.c
|
||||
@@ -786,6 +786,7 @@
|
||||
#ifdef WITH_THREAD
|
||||
PyGILState_Release(threadstate);
|
||||
#endif
|
||||
+ ; /* Make gcc happy: a label can't be at the end of a function */
|
||||
}
|
||||
|
||||
static void _pysqlite_drop_unused_statement_references(pysqlite_Connection* self)
|
||||
Reference in New Issue
Block a user