# HG changeset patch # User jodogne # Date 1499679108 -7200 # Node ID 6925272458569ed48bc67cddd4b58f7d8b5bdb94 # Parent f31dfb131dee9afebd74c7db746d26c87e03901f fix for SQLite >= 3.19.0 diff -r f31dfb131dee -r 692527245856 Core/SQLite/SQLiteTypes.h --- a/Core/SQLite/SQLiteTypes.h Mon Jul 10 11:27:55 2017 +0200 +++ b/Core/SQLite/SQLiteTypes.h Mon Jul 10 11:31:48 2017 +0200 @@ -42,8 +42,19 @@ #error Please define macro ORTHANC_SQLITE_VERSION #endif + +/** + * "sqlite3_value" is defined as: + * - "typedef struct Mem sqlite3_value;" up to SQLite <= 3.18.2 + * - "typedef struct sqlite3_value sqlite3_value;" since SQLite >= 3.19.0. + * We create our own copy of this typedef to get around this API incompatibility. + * https://github.com/mackyle/sqlite/commit/db1d90df06a78264775a14d22c3361eb5b42be17 + **/ + #if ORTHANC_SQLITE_VERSION < 3019000 struct Mem; +#else +struct sqlite3_value; #endif namespace Orthanc @@ -52,14 +63,6 @@ { namespace Internals { - /** - * "sqlite3_value" is defined as: - * - "typedef struct Mem sqlite3_value;" up to SQLite <= 3.18.2 - * - "typedef struct sqlite3_value sqlite3_value;" since SQLite >= 3.19.0. - * We create our own copy of this typedef to get around this API incompatibility. - * https://github.com/mackyle/sqlite/commit/db1d90df06a78264775a14d22c3361eb5b42be17 - **/ - #if ORTHANC_SQLITE_VERSION < 3019000 typedef struct ::Mem SQLiteValue; #else