Moved check and define for OS_WINCE from os_win.c to os.h (with the other OS_* defines). This allows OS_WINCE to be available for mutex_w32.c which is included earlier than os_win.c in the almagamation. (CVS 5176)
FossilOrigin-Name: ad6a782e7c408f6c3ebff5f2715c629b75c8002d
This commit is contained in:
parent
c9ded4c62e
commit
712d6f9dad
16
manifest
16
manifest
@ -1,5 +1,5 @@
|
||||
C When\sinitializing\sthe\ssqlite_sequence\sentry\sfor\san\sAUTOINCREMENT\stable,\nmake\ssure\sthe\svalue\sis\san\sreasonable\sinteger\seven\sif\sthe\sinitial\sinsert\nfailed.\s\sTicket\s#3148.\s(CVS\s5175)
|
||||
D 2008-05-29T03:20:59
|
||||
C Moved\scheck\sand\sdefine\sfor\sOS_WINCE\sfrom\sos_win.c\sto\sos.h\s(with\sthe\sother\sOS_*\sdefines).\s\sThis\sallows\sOS_WINCE\sto\sbe\savailable\sfor\smutex_w32.c\swhich\sis\sincluded\searlier\sthan\sos_win.c\sin\sthe\salmagamation.\s(CVS\s5176)
|
||||
D 2008-05-29T03:54:27
|
||||
F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
|
||||
F Makefile.in 62b2a40ff5944dd33c9c3184b21f720ea8e48a44
|
||||
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
|
||||
@ -127,11 +127,11 @@ F src/mutex_os2.c 2911ea96955ab6cba734cc4ad903fe76f834b39e
|
||||
F src/mutex_unix.c 466d20378a0645fea64c3f2e2669c33b7802df56
|
||||
F src/mutex_w32.c 133698096a2c4e81cd11ea6f4de7891c66f7b9f7
|
||||
F src/os.c 541ea39fbacc18483b3aa96cd0242bad2dd0f049
|
||||
F src/os.h c0727c1a360aea23dc3213b32417608afa7143a3
|
||||
F src/os.h 6e7e5d4efdc907b7a1a8cddb0cf984af01843fad
|
||||
F src/os_common.h 9da7339466404707af49943fe4c47e608034761b
|
||||
F src/os_os2.c 1578149e21c4eac42c7f230a6f40500846f8e781
|
||||
F src/os_unix.c 06dceb3230249d6e7c6a1d8d602fa6a93f4085b9
|
||||
F src/os_win.c 3b0a31c598dcafada283368f2a7f7bb3fd78b26b
|
||||
F src/os_win.c 812f9ba8cd90c8aa54914a56897fb534494576d8
|
||||
F src/pager.c d0a77feeaeecaaaec9342a3bb3865ed9a490897a
|
||||
F src/pager.h 1ccde54041195311c2b09b6936404d2192db44da
|
||||
F src/parse.y fc4bd35c6088901f7c8daead26c6fb11c87d22e7
|
||||
@ -590,7 +590,7 @@ F tool/speedtest16.c 6f5bc019dcf8b6537f379bbac0408a9e1a86f0b6
|
||||
F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
|
||||
F tool/speedtest8.c e74126bc12178fa29904f711bb100212a5448041
|
||||
F tool/speedtest8inst1.c 025879132979a5fdec11218472cba6cf8f6ec854
|
||||
P 0d55328e680e23aae36d8f32a05aa3815393ac1d
|
||||
R ab453b09cecfedf1a77ed78183e41224
|
||||
U drh
|
||||
Z 59397d3549d58da0def94fe92fd606ec
|
||||
P 7e6847852d4517b1d14bebb8f0ae4d938b0b6f6d
|
||||
R 91aa8ed903089be5892cc06ca20f01b5
|
||||
U shane
|
||||
Z 71f9353c7030348ee2a7d1aadf46f880
|
||||
|
@ -1 +1 @@
|
||||
7e6847852d4517b1d14bebb8f0ae4d938b0b6f6d
|
||||
ad6a782e7c408f6c3ebff5f2715c629b75c8002d
|
11
src/os.h
11
src/os.h
@ -17,7 +17,7 @@
|
||||
** This header file is #include-ed by sqliteInt.h and thus ends up
|
||||
** being included by every source file.
|
||||
**
|
||||
** $Id: os.h,v 1.100 2008/05/29 02:53:00 shane Exp $
|
||||
** $Id: os.h,v 1.101 2008/05/29 03:54:27 shane Exp $
|
||||
*/
|
||||
#ifndef _SQLITE_OS_H_
|
||||
#define _SQLITE_OS_H_
|
||||
@ -66,6 +66,15 @@
|
||||
# endif
|
||||
#endif
|
||||
|
||||
/*
|
||||
** Determine if we are dealing with WindowsCE - which has a much
|
||||
** reduced API.
|
||||
*/
|
||||
#if defined(_WIN32_WCE)
|
||||
# define OS_WINCE 1
|
||||
#else
|
||||
# define OS_WINCE 0
|
||||
#endif
|
||||
|
||||
|
||||
/*
|
||||
|
@ -12,7 +12,7 @@
|
||||
**
|
||||
** This file contains code that is specific to windows.
|
||||
**
|
||||
** $Id: os_win.c,v 1.122 2008/05/16 04:51:55 danielk1977 Exp $
|
||||
** $Id: os_win.c,v 1.123 2008/05/29 03:54:27 shane Exp $
|
||||
*/
|
||||
#include "sqliteInt.h"
|
||||
#if OS_WIN /* This file is used for windows only */
|
||||
@ -66,11 +66,8 @@
|
||||
** Determine if we are dealing with WindowsCE - which has a much
|
||||
** reduced API.
|
||||
*/
|
||||
#if defined(_WIN32_WCE)
|
||||
# define OS_WINCE 1
|
||||
#if defined(OS_WINCE)
|
||||
# define AreFileApisANSI() 1
|
||||
#else
|
||||
# define OS_WINCE 0
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
Loading…
x
Reference in New Issue
Block a user