/ Check-in [25ebadd0]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix typos in using the MSVC_VERSION macro.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | branch-3.17
Files: files | file ages | folders
SHA1: 25ebadd096ce98fd0f9fab809969d34b958794f6
User & Date: drh 2017-02-13 11:35:38
Context
2017-02-13
16:02
Version 3.17.0 check-in: ada05cfa user: drh tags: release, version-3.17.0, branch-3.17
13:26
Fix typos in using the MSVC_VERSION macro. check-in: f3b65926 user: drh tags: trunk
11:35
Fix typos in using the MSVC_VERSION macro. check-in: 25ebadd0 user: drh tags: branch-3.17
2017-02-11
15:02
Ensure that indexed expressions with collating sequences are handled correctly. Fix for ticket [eb703ba7b50c1a5] backported from trunk. check-in: b2e49ae3 user: drh tags: branch-3.17
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/btreeInt.h.

   690    690   ** two-byte aligned address.  get2bytea() is only used for accessing the
   691    691   ** cell addresses in a btree header.
   692    692   */
   693    693   #if SQLITE_BYTEORDER==4321
   694    694   # define get2byteAligned(x)  (*(u16*)(x))
   695    695   #elif SQLITE_BYTEORDER==1234 && GCC_VERSION>=4008000
   696    696   # define get2byteAligned(x)  __builtin_bswap16(*(u16*)(x))
   697         -#elif SQLITE_BYTEORDER==1234 && MSCV_VERSION>=1300
          697  +#elif SQLITE_BYTEORDER==1234 && MSVC_VERSION>=1300
   698    698   # define get2byteAligned(x)  _byteswap_ushort(*(u16*)(x))
   699    699   #else
   700    700   # define get2byteAligned(x)  ((x)[0]<<8 | (x)[1])
   701    701   #endif

Changes to src/mutex_w32.c.

    83     83   ** compiled without mutexes (SQLITE_THREADSAFE=0).
    84     84   */
    85     85   void sqlite3MemoryBarrier(void){
    86     86   #if defined(SQLITE_MEMORY_BARRIER)
    87     87     SQLITE_MEMORY_BARRIER;
    88     88   #elif defined(__GNUC__)
    89     89     __sync_synchronize();
    90         -#elif MSCV_VERSION>=1300
           90  +#elif MSVC_VERSION>=1300
    91     91     _ReadWriteBarrier();
    92     92   #elif defined(MemoryBarrier)
    93     93     MemoryBarrier();
    94     94   #endif
    95     95   }
    96     96   
    97     97   /*