Skip to content

Commit 8eac7de

Browse files
committed
DuckDuckGo GRDB.swift 2.0.0 (GRDB 6.6.0, SQLCipher 4.5.3)
1 parent 72b86ee commit 8eac7de

File tree

4 files changed

+75614
-71006
lines changed

4 files changed

+75614
-71006
lines changed

.github/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ The default branch for this repository is `SQLCipher` so that we can more easily
77

88
## Versioning
99

10-
* This Package: *1.2.1.1*
11-
* GRDB: *5.26.0*
12-
* SQLCipher: *4.5.1*
10+
* This Package: *2.0.0*
11+
* GRDB: *6.6.0*
12+
* SQLCipher: *4.5.3*
1313

1414
## Contributions
1515
We do not accept contributions to this repository at this time. However, feel free to open an issue in order to start a discussion.
@@ -66,7 +66,7 @@ Once approved:
6666
* push the tag,
6767
* update the reference to GRDB in BSK to point to a tag.
6868

69-
# Compiling SQLCipher manually
69+
### Compiling SQLCipher manually
7070

7171
In case `prepare_release.sh` script fails, you need to compile SQLCipher amalgamation package
7272
manually. See [general instructions](https://github.com/sqlcipher/sqlcipher#compiling-for-unix-like-systems):

Sources/SQLCipher/include/SQLCipher_config.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,30 @@
33

44
#include "sqlite3.h"
55

6-
typedef void(*errorLogCallback)(void *pArg, int iErrCode, const char *zMsg);
6+
typedef void(*_errorLogCallback)(void *pArg, int iErrCode, const char *zMsg);
77

88
/// Wrapper around sqlite3_config(SQLITE_CONFIG_LOG, ...) which is a variadic
99
/// function that can't be used from Swift.
10-
static inline void registerErrorLogCallback(errorLogCallback callback) {
10+
static inline void _registerErrorLogCallback(_errorLogCallback callback) {
1111
sqlite3_config(SQLITE_CONFIG_LOG, callback, 0);
1212
}
1313

1414
#if SQLITE_VERSION_NUMBER >= 3029000
1515
/// Wrapper around sqlite3_db_config() which is a variadic function that can't
1616
/// be used from Swift.
17-
static inline void disableDoubleQuotedStringLiterals(sqlite3 *db) {
17+
static inline void _disableDoubleQuotedStringLiterals(sqlite3 *db) {
1818
sqlite3_db_config(db, SQLITE_DBCONFIG_DQS_DDL, 0, (void *)0);
1919
sqlite3_db_config(db, SQLITE_DBCONFIG_DQS_DML, 0, (void *)0);
2020
}
2121

2222
/// Wrapper around sqlite3_db_config() which is a variadic function that can't
2323
/// be used from Swift.
24-
static inline void enableDoubleQuotedStringLiterals(sqlite3 *db) {
24+
static inline void _enableDoubleQuotedStringLiterals(sqlite3 *db) {
2525
sqlite3_db_config(db, SQLITE_DBCONFIG_DQS_DDL, 1, (void *)0);
2626
sqlite3_db_config(db, SQLITE_DBCONFIG_DQS_DML, 1, (void *)0);
2727
}
2828
#else
29-
static inline void disableDoubleQuotedStringLiterals(sqlite3 *db) { }
30-
static inline void enableDoubleQuotedStringLiterals(sqlite3 *db) { }
29+
static inline void _disableDoubleQuotedStringLiterals(sqlite3 *db) { }
30+
static inline void _enableDoubleQuotedStringLiterals(sqlite3 *db) { }
3131
#endif
3232
#endif /* grdb_config_h */

0 commit comments

Comments
 (0)