SQLite

Check-in [d3d491a546]
Login

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

Overview
Comment:Merge several compiler compatibility fixes to trunk.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: d3d491a5461e21d84c6425977b80deedc7fa8a3a
User & Date: mistachkin 2012-06-21 14:05:15.442
Context
2012-06-21
14:25
Fix the SQLITE_ZERO_MALLOC compile-time option so that it works on windows. (check-in: b80bc52f89 user: drh tags: trunk)
14:05
Merge several compiler compatibility fixes to trunk. (check-in: d3d491a546 user: mistachkin tags: trunk)
13:00
Remove support for OS/2 from the source tree. (check-in: ff828c67e5 user: drh tags: trunk)
2012-06-18
17:15
Allow the SQLITE_API macro to apply to the sqlite3_win32_sleep function. (Closed-Leaf check-in: 21266c68af user: mistachkin tags: compiler-compat)
Changes
Side-by-Side Diff Ignore Whitespace Patch
Changes to ext/fts3/fts3_unicode2.c.
︙
142
143
144
145
146
147
148
149

150
151
152
153
154
155
156

142
143
144
145
146
147
148

149
150
151
152
153
154
155
156








-
+








        iLo = iTest+1;
      }else{
        iHi = iTest-1;
      }
    }
    assert( aEntry[0]<key );
    assert( key>=aEntry[iRes] );
    return (c >= ((aEntry[iRes]>>10) + (aEntry[iRes]&0x3FF)));
    return (((unsigned int)c) >= ((aEntry[iRes]>>10) + (aEntry[iRes]&0x3FF)));
  }
  return 1;
}


/*
** If the argument is a codepoint corresponding to a lowercase letter
︙
Changes to src/mutex_w32.c.
︙
105
106
107
108
109
110
111
112

113
114
115
116
117
118
119

105
106
107
108
109
110
111

112
113
114
115
116
117
118
119








-
+








/* As winMutexInit() and winMutexEnd() are called as part
** of the sqlite3_initialize and sqlite3_shutdown()
** processing, the "interlocked" magic is probably not
** strictly necessary.
*/
static long winMutex_lock = 0;

extern void sqlite3_win32_sleep(DWORD milliseconds); /* os_win.c */
void sqlite3_win32_sleep(DWORD milliseconds); /* os_win.c */

static int winMutexInit(void){ 
  /* The first to increment to 1 does actual initialization */
  if( InterlockedCompareExchange(&winMutex_lock, 1, 0)==0 ){
    int i;
    for(i=0; i<ArraySize(winMutex_staticMutexes); i++){
#if SQLITE_OS_WINRT
︙
Changes to src/shell.c.
︙
2689
2690
2691
2692
2693
2694
2695

2696
2697
2698
2699





2700
2701
2702
2703
2704
2705
2706

2689
2690
2691
2692
2693
2694
2695
2696




2697
2698
2699
2700
2701
2702
2703
2704
2705
2706
2707
2708








+
-
-
-
-
+
+
+
+
+








** 0 return indicates an error of some kind.
*/
static char *find_home_dir(void){
  static char *home_dir = NULL;
  if( home_dir ) return home_dir;

#if !defined(_WIN32) && !defined(WIN32) && !defined(_WIN32_WCE) && !defined(__RTP__) && !defined(_WRS_KERNEL)
  {
  struct passwd *pwent;
  uid_t uid = getuid();
  if( (pwent=getpwuid(uid)) != NULL) {
    home_dir = pwent->pw_dir;
    struct passwd *pwent;
    uid_t uid = getuid();
    if( (pwent=getpwuid(uid)) != NULL) {
      home_dir = pwent->pw_dir;
    }
  }
#endif

#if defined(_WIN32_WCE)
  /* Windows CE (arm-wince-mingw32ce-gcc) does not provide getenv()
   */
  home_dir = "/";
︙