aboutsummaryrefslogtreecommitdiff
path: root/src/utf.c
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2016-01-01 13:25:06 +0000
committerdrh <drh@noemail.net>2016-01-01 13:25:06 +0000
commit8de1d77c60af1fbac5cc7eb7eb84efa3e43a320b (patch)
treeb2968afbe57bd3f1d1305f5a2241f575cca3b909 /src/utf.c
parent173b60999eb7b2fda450df311e286539fcd2b854 (diff)
parenta660caf2f01c99ef48085c731e200b5a2fa575b5 (diff)
downloadsqlite-8de1d77c60af1fbac5cc7eb7eb84efa3e43a320b.tar.gz
sqlite-8de1d77c60af1fbac5cc7eb7eb84efa3e43a320b.zip
Merge the latest enhancements from trunk.
FossilOrigin-Name: c0be246a740c8f33a7c07e1414688364dee56ece
Diffstat (limited to 'src/utf.c')
-rw-r--r--src/utf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/utf.c b/src/utf.c
index 25f4dadf0..ee367c139 100644
--- a/src/utf.c
+++ b/src/utf.c
@@ -37,13 +37,13 @@
#include <assert.h>
#include "vdbeInt.h"
-#ifndef SQLITE_AMALGAMATION
+#if !defined(SQLITE_AMALGAMATION) && SQLITE_BYTEORDER==0
/*
** The following constant value is used by the SQLITE_BIGENDIAN and
** SQLITE_LITTLEENDIAN macros.
*/
const int sqlite3one = 1;
-#endif /* SQLITE_AMALGAMATION */
+#endif /* SQLITE_AMALGAMATION && SQLITE_BYTEORDER==0 */
/*
** This lookup table is used to help decode the first byte of