diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2015-02-13 17:12:44 +0000 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2015-02-13 17:12:44 +0000 |
| commit | 9d0fd4d7e5b5a3f3752d5c2f625fd6243da10704 (patch) | |
| tree | 538feff5efeb824fcf0581ec97776f73d0781cff | |
| parent | cb0ded1e07c56db657cf1008338ef35f8697e6a6 (diff) | |
| download | rspamd-9d0fd4d7e5b5a3f3752d5c2f625fd6243da10704.tar.gz rspamd-9d0fd4d7e5b5a3f3752d5c2f625fd6243da10704.zip | |
Avoid variables conflict.
| -rw-r--r-- | src/libserver/fuzzy_backend.c | 4 | ||||
| -rw-r--r-- | src/libstat/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/libstat/learn_cache/sqlite3_cache.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/libserver/fuzzy_backend.c b/src/libserver/fuzzy_backend.c index 8de026fd6..45a6aea30 100644 --- a/src/libserver/fuzzy_backend.c +++ b/src/libserver/fuzzy_backend.c @@ -46,7 +46,7 @@ struct rspamd_fuzzy_backend { }; -const char *create_tables_sql = +static const char *create_tables_sql = "BEGIN;" "CREATE TABLE digests(" "id INTEGER PRIMARY KEY," @@ -60,7 +60,7 @@ const char *create_tables_sql = "digest_id INTEGER REFERENCES digests(id) ON DELETE CASCADE " "ON UPDATE CASCADE);" "COMMIT;"; -const char *create_index_sql = +static const char *create_index_sql = "BEGIN;" "CREATE UNIQUE INDEX IF NOT EXISTS d ON digests(digest);" "CREATE INDEX IF NOT EXISTS t ON digests(time);" diff --git a/src/libstat/CMakeLists.txt b/src/libstat/CMakeLists.txt index 5c4e2bc74..fc9450140 100644 --- a/src/libstat/CMakeLists.txt +++ b/src/libstat/CMakeLists.txt @@ -16,9 +16,11 @@ ADD_LIBRARY(rspamd-stat ${LINK_TYPE} ${LIBSTATSRC} ${CLASSIFIERSSRC} ${BACKENDSSRC} ${CACHESSRC}) + IF(NOT DEBIAN_BUILD) SET_TARGET_PROPERTIES(rspamd-stat PROPERTIES VERSION ${RSPAMD_VERSION}) ENDIF(NOT DEBIAN_BUILD) + SET_TARGET_PROPERTIES(rspamd-stat PROPERTIES LINKER_LANGUAGE C COMPILE_FLAGS "-DRSPAMD_LIB") TARGET_LINK_LIBRARIES(rspamd-stat rspamd-server) TARGET_LINK_LIBRARIES(rspamd-stat sqlite3) diff --git a/src/libstat/learn_cache/sqlite3_cache.c b/src/libstat/learn_cache/sqlite3_cache.c index 0bde829f7..c92c69a21 100644 --- a/src/libstat/learn_cache/sqlite3_cache.c +++ b/src/libstat/learn_cache/sqlite3_cache.c @@ -32,7 +32,7 @@ #include "message.h" #include <sqlite3.h> -const char *create_tables_sql = +static const char *create_tables_sql = "BEGIN;" "CREATE TABLE IF NOT EXISTS learns(" "id INTEGER PRIMARY KEY," |