Mercurial > hg > orthanc

changeset 2303:692527245856

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix for SQLite >= 3.19.0
author jodogne
date Mon, 10 Jul 2017 11:31:48 +0200
parents f31dfb131dee
children 563bf878407a
files Core/SQLite/SQLiteTypes.h
diffstat 1 files changed, 11 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- 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