clang fix (nw)

This commit is contained in:
Miodrag Milanovic 2015-02-20 08:50:49 +01:00
parent 38d366edbb
commit 08777d43b0

View File

@ -8641,11 +8641,6 @@ typedef INT16_TYPE LogEst;
** -DSQLITE_RUNTIME_BYTEORDER=1 is set, then byte-order is determined ** -DSQLITE_RUNTIME_BYTEORDER=1 is set, then byte-order is determined
** at run-time. ** at run-time.
*/ */
#ifdef SQLITE_AMALGAMATION
SQLITE_PRIVATE const int sqlite3one = 1;
#else
SQLITE_PRIVATE const int sqlite3one;
#endif
#if (defined(i386) || defined(__i386__) || defined(_M_IX86) || \ #if (defined(i386) || defined(__i386__) || defined(_M_IX86) || \
defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || \ defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || \
defined(_M_AMD64) || defined(_M_ARM) || defined(__x86) || \ defined(_M_AMD64) || defined(_M_ARM) || defined(__x86) || \
@ -8663,6 +8658,11 @@ SQLITE_PRIVATE const int sqlite3one;
# define SQLITE_UTF16NATIVE SQLITE_UTF16BE # define SQLITE_UTF16NATIVE SQLITE_UTF16BE
#endif #endif
#if !defined(SQLITE_BYTEORDER) #if !defined(SQLITE_BYTEORDER)
#ifdef SQLITE_AMALGAMATION
SQLITE_PRIVATE const int sqlite3one = 1;
#else
SQLITE_PRIVATE const int sqlite3one;
#endif
# define SQLITE_BYTEORDER 0 /* 0 means "unknown at compile-time" */ # define SQLITE_BYTEORDER 0 /* 0 means "unknown at compile-time" */
# define SQLITE_BIGENDIAN (*(char *)(&sqlite3one)==0) # define SQLITE_BIGENDIAN (*(char *)(&sqlite3one)==0)
# define SQLITE_LITTLEENDIAN (*(char *)(&sqlite3one)==1) # define SQLITE_LITTLEENDIAN (*(char *)(&sqlite3one)==1)
@ -22303,7 +22303,7 @@ SQLITE_PRIVATE int sqlite3ThreadJoin(SQLiteThread *p, void **ppOut){
** The following constant value is used by the SQLITE_BIGENDIAN and ** The following constant value is used by the SQLITE_BIGENDIAN and
** SQLITE_LITTLEENDIAN macros. ** SQLITE_LITTLEENDIAN macros.
*/ */
SQLITE_PRIVATE const int sqlite3one = 1; //SQLITE_PRIVATE const int sqlite3one = 1;
#endif /* SQLITE_AMALGAMATION */ #endif /* SQLITE_AMALGAMATION */
/* /*