Commit ef3f88f
committed
Fix building with standalone sqlite3 >= 3.30.0
SQLite 3.30.0 changed the definition of SQLITE_DETERMINISTIC:
`-#define SQLITE_DETERMINISTIC 0x800`
`+#define SQLITE_DETERMINISTIC 0x000000800`
Meaning that the (older) system sqlite3 library and the pod have
different definitions, even though they're the same value.
We've been importing the system sqlite3 module in SQLiteObjc.h
even when linking against standalone sqlite.
I added a check to SQLiteObjc.h to import the sqlite3 pod when
we're using it, instead of always importing the system module.
This leads to there being only one definition in scope.1 parent 0a9893e commit ef3f88f
2 files changed
+6
-1
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
50 | 50 | | |
51 | 51 | | |
52 | 52 | | |
53 | | - | |
| 53 | + | |
| 54 | + | |
54 | 55 | | |
55 | 56 | | |
56 | 57 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
26 | 29 | | |
| 30 | + | |
27 | 31 | | |
28 | 32 | | |
29 | 33 | | |
| |||
0 commit comments