SQLite

Check-in [016481b39f]
Login

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

Overview
Comment:Fix some compilation issues.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | winCeLocalTime
Files: files | file ages | folders
SHA1: 016481b39f8b23b4f0f851053068d8eaee6122e1
User & Date: mistachkin 2016-04-11 22:10:26.085
Context
2016-04-11
22:24
Merge updates from trunk. (check-in: b8094166b3 user: mistachkin tags: winCeLocalTime)
22:10
Fix some compilation issues. (check-in: 016481b39f user: mistachkin tags: winCeLocalTime)
2016-04-05
17:59
Merge updates from trunk. (check-in: 00990020d0 user: mistachkin tags: winCeLocalTime)
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/os_win.c.
︙︙
21
22
23
24
25
26
27










28
29
30
31
32
33
34

#include "os_common.h"

/*
** Include the header file for the Windows VFS.
*/
#include "os_win.h"











/*
** Compiling and using WAL mode requires several APIs that are only
** available in Windows platforms based on the NT kernel.
*/
#if !SQLITE_OS_WINNT && !defined(SQLITE_OMIT_WAL)
#  error "WAL mode requires support from the Windows NT kernel, compile\
 with SQLITE_OMIT_WAL."








>
>
>
>
>
>
>
>
>
>








21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44

#include "os_common.h"

/*
** Include the header file for the Windows VFS.
*/
#include "os_win.h"

/*
** The MSVC CRT on Windows CE may not have a localtime() function.  So
** declare a substitute.
*/
#if SQLITE_OS_WINCE && \
    (!defined(SQLITE_MSVC_LOCALTIME_API) || !SQLITE_MSVC_LOCALTIME_API)
#  include <time.h>
struct tm *__cdecl localtime(const time_t *);
#endif

/*
** Compiling and using WAL mode requires several APIs that are only
** available in Windows platforms based on the NT kernel.
*/
#if !SQLITE_OS_WINNT && !defined(SQLITE_OMIT_WAL)
#  error "WAL mode requires support from the Windows NT kernel, compile\
 with SQLITE_OMIT_WAL."
︙︙
2115
2116
2117
2118
2119
2120
2121
2122
2123
2124
2125
2126
2127
2128
2129
2130


2131
2132
2133
2134
2135
2136
2137

      "delayed %dms for lock/sharing conflict at line %d",
      winIoerrRetryDelay*nRetry*(nRetry+1)/2, lineno
    );
  }
}

/*
** This #if cannot use SQLITE_OS_WINCE because the corresponding section
** in "sqliteInt.h" does not use it.
*/
#if defined(_WIN32_WCE) && \
    (!defined(SQLITE_MSVC_LOCALTIME_API) || !SQLITE_MSVC_LOCALTIME_API)
/*
** The MSVC CRT on Windows CE may not have a localtime() function.  So
** create a substitute.
*/


struct tm *__cdecl localtime(const time_t *t)
{
  static struct tm y;
  FILETIME uTm, lTm;
  SYSTEMTIME pTm;
  sqlite3_int64 t64;
  t64 = *t;








<
<
<
<
<
<

|

>
>








2125
2126
2127
2128
2129
2130
2131






2132
2133
2134
2135
2136
2137
2138
2139
2140
2141
2142
2143

      "delayed %dms for lock/sharing conflict at line %d",
      winIoerrRetryDelay*nRetry*(nRetry+1)/2, lineno
    );
  }
}

/*






** The MSVC CRT on Windows CE may not have a localtime() function.  So
** define a substitute.
*/
#if SQLITE_OS_WINCE && \
    (!defined(SQLITE_MSVC_LOCALTIME_API) || !SQLITE_MSVC_LOCALTIME_API)
struct tm *__cdecl localtime(const time_t *t)
{
  static struct tm y;
  FILETIME uTm, lTm;
  SYSTEMTIME pTm;
  sqlite3_int64 t64;
  t64 = *t;
︙︙
Changes to src/sqliteInt.h.
︙︙
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230

#      pragma intrinsic(_ReadWriteBarrier)
#    else
#      include <cmnintrin.h>
#    endif
#  endif
#endif

/*
** The MSVC CRT on Windows CE may not have a localtime() function.  So
** declare a substitute.  The function itself is defined in "os_win.c".
*/
#if defined(_WIN32_WCE) && \
    (!defined(SQLITE_MSVC_LOCALTIME_API) || !SQLITE_MSVC_LOCALTIME_API)
#  include <time.h>
struct tm *__cdecl localtime(const time_t *);
#endif

/*
** The SQLITE_THREADSAFE macro must be defined as 0, 1, or 2.
** 0 means mutexes are permanently disable and the library is never
** threadsafe.  1 means the library is serialized which is the highest
** level of threadsafety.  2 means the library is multithreaded - multiple
** threads can use SQLite as long as no two threads try to use the same
** database connection at the same time.








<
<
<
<
<
<
<
<
<
<








207
208
209
210
211
212
213










214
215
216
217
218
219
220

#      pragma intrinsic(_ReadWriteBarrier)
#    else
#      include <cmnintrin.h>
#    endif
#  endif
#endif











/*
** The SQLITE_THREADSAFE macro must be defined as 0, 1, or 2.
** 0 means mutexes are permanently disable and the library is never
** threadsafe.  1 means the library is serialized which is the highest
** level of threadsafety.  2 means the library is multithreaded - multiple
** threads can use SQLite as long as no two threads try to use the same
** database connection at the same time.
︙︙