From: drh <drh@noemail.net>
Date: Mon, 13 Feb 2017 13:20:02 +0000 (+0000)
Subject: Avoid a duplication #define in FTS5
X-Git-Tag: version-3.18.0~130
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ac279be98ebbe5cce899c549f12d16204d460a67;p=thirdparty%2Fsqlite.git

Avoid a duplication #define in FTS5

FossilOrigin-Name: c447441cff1884d6fe5f0a76d64b3e7d908584a1
---

diff --git a/ext/fts5/fts5Int.h b/ext/fts5/fts5Int.h
index 9ef338e821..d350856573 100644
--- a/ext/fts5/fts5Int.h
+++ b/ext/fts5/fts5Int.h
@@ -30,7 +30,9 @@ typedef short i16;
 typedef sqlite3_int64 i64;
 typedef sqlite3_uint64 u64;
 
-#define ArraySize(x) ((int)(sizeof(x) / sizeof(x[0])))
+#ifndef ArraySize
+# define ArraySize(x) ((int)(sizeof(x) / sizeof(x[0])))
+#endif
 
 #define testcase(x)
 #define ALWAYS(x) 1
diff --git a/manifest b/manifest
index aff48f9780..b5ae3ca250 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sindexes\son\sexpressions\sso\sthat\sthey\scan\sbe\sactually\sused\swith\na\sCOLLATE\sclause.
-D 2017-02-11T14:59:58.753
+C Avoid\sa\sduplication\s#define\sin\sFTS5
+D 2017-02-13T13:20:02.419
 F Makefile.in edb6bcdd37748d2b1c3422ff727c748df7ffe918
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 067a6766f800cc8d72845ab61f8de4ffe8f3fc99
@@ -98,7 +98,7 @@ F ext/fts3/unicode/mkunicode.tcl 2debed3f582d77b3fdd0b8830880250021571fd8
 F ext/fts3/unicode/parseunicode.tcl da577d1384810fb4e2b209bf3313074353193e95
 F ext/fts5/extract_api_docs.tcl a36e54ec777172ddd3f9a88daf593b00848368e0
 F ext/fts5/fts5.h 62f3e33ceeb9a428db139f9c012186b371da1cc7
-F ext/fts5/fts5Int.h b2eda36e0f224365c8e23dc8f559311834f1c13f
+F ext/fts5/fts5Int.h c629b24d2b92b99596f3b8e82289fddca06df6e1
 F ext/fts5/fts5_aux.c 67acf8d51723cf28ffc3828210ba662df4b8d267
 F ext/fts5/fts5_buffer.c 4c1502d4c956cd092c89ce4480867f9d8bf325cd
 F ext/fts5/fts5_config.c 5af9c360e99669d29f06492c370892394aba0857
@@ -1555,7 +1555,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 9689d04b8250139e32078b2aa9748edcc6231bcd
-R e95d56d566e83b0838849dba73bfcd3a
+P e464b919f76520b45bb58983c6702db59d820ee4
+R 8c09ada0ea1970f0e52c7f9e3e6704e9
 U drh
-Z 0aabcf0e8948d008893cd3f00b6802af
+Z 6a635e248bfa56654adaa33accae463e
diff --git a/manifest.uuid b/manifest.uuid
index 85764546dc..a7d1b63450 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e464b919f76520b45bb58983c6702db59d820ee4
\ No newline at end of file
+c447441cff1884d6fe5f0a76d64b3e7d908584a1
\ No newline at end of file