mirrors/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix various internal #defines to conform to new C-language naming restrictions,

Browse Source 
specifically that private-use macros names must not begin with "_".

FossilOrigin-Name: 5471aca0158851d3fb0a2517306917536deb38bb
This commit is contained in:
drh 2016-07-09 16:14:45 +00:00
parent c2024c4ef2
commit 43f58d6a17
19 changed files with 82 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
manifest
View File

@ -1,5 +1,5 @@
C Add\ssupport\sfor\sthe\swin32-none\sVFS. C Fix\svarious\sinternal\s#defines\sto\sconform\sto\snew\sC-language\snaming\srestrictions,\nspecifically\sthat\sprivate-use\smacros\snames\smust\snot\sbegin\swith\s"_".
D 2016-07-09T00:06:21.171 D 2016-07-09T16:14:45.037
F Makefile.in 6c20d44f72d4564f11652b26291a214c8367e5db F Makefile.in 6c20d44f72d4564f11652b26291a214c8367e5db
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
@ -328,7 +328,7 @@ F src/backup.c 6df65fdd569c901a418887a1a76f82ec35044556
F src/bitvec.c 3ee4c8b2c94ed3a7377256e18199e6ff5cf33f63 F src/bitvec.c 3ee4c8b2c94ed3a7377256e18199e6ff5cf33f63
F src/btmutex.c bc87dd3b062cc26edfe79918de2200ccb8d41e73 F src/btmutex.c bc87dd3b062cc26edfe79918de2200ccb8d41e73
F src/btree.c dc4e5f3e95fd57b610422e36e0913662ecd6814c F src/btree.c dc4e5f3e95fd57b610422e36e0913662ecd6814c
F src/btree.h aee84823bb383d6ae3728b068f9130d2b36b71eb F src/btree.h 075c45707c0f8f8af118f739f36df8098a08b7da
F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5 F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5
F src/build.c d1fdfd7ab8f5447e494ef15825973bf0719527c6 F src/build.c d1fdfd7ab8f5447e494ef15825973bf0719527c6
F src/callback.c 2e76147783386374bf01b227f752c81ec872d730 F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
@ -343,8 +343,8 @@ F src/fkey.c bc4145347595b7770f9a598cff1c848302cf5413
F src/func.c 61a4114cf7004f10c542cfabbab9f2bcb9033045 F src/func.c 61a4114cf7004f10c542cfabbab9f2bcb9033045
F src/global.c c45ea22aff29334f6a9ec549235ac3357c970015 F src/global.c c45ea22aff29334f6a9ec549235ac3357c970015
F src/hash.c 55b5fb474100cee0b901edaf203e26c970940f36 F src/hash.c 55b5fb474100cee0b901edaf203e26c970940f36
F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094 F src/hash.h ab34c5c54a9e9de2e790b24349ba5aab3dbb4fd4
F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08 F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
F src/insert.c 8f4e9fcbd8e95e85f15647ba8b413b18d556ec2b F src/insert.c 8f4e9fcbd8e95e85f15647ba8b413b18d556ec2b
F src/legacy.c 75d3023be8f0d2b99d60f905090341a03358c58e F src/legacy.c 75d3023be8f0d2b99d60f905090341a03358c58e
F src/loadext.c 4237fd37ca589f1d90b3ea925dd9df20da8e0c84 F src/loadext.c 4237fd37ca589f1d90b3ea925dd9df20da8e0c84
@ -356,22 +356,22 @@ F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
F src/mem3.c 8768ac94694f31ffaf8b4d0ea5dc08af7010a35a F src/mem3.c 8768ac94694f31ffaf8b4d0ea5dc08af7010a35a
F src/mem5.c 9bf955937b07f8c32541c8a9991f33ce3173d944 F src/mem5.c 9bf955937b07f8c32541c8a9991f33ce3173d944
F src/memjournal.c 95752936c11dc6995672d1dd783cd633eea0cc95 F src/memjournal.c 95752936c11dc6995672d1dd783cd633eea0cc95
F src/msvc.h d9ba56c6851227ab44b3f228a35f3f5772296495 F src/msvc.h 4942752b6a253116baaa8de75256c51a459a5e81
F src/mutex.c 8e45800ee78e0cd1f1f3fe8e398853307f4a085c F src/mutex.c 8e45800ee78e0cd1f1f3fe8e398853307f4a085c
F src/mutex.h 779d588e3b7756ec3ecf7d78cde1d84aba414f85 F src/mutex.h 779d588e3b7756ec3ecf7d78cde1d84aba414f85
F src/mutex_noop.c 9d4309c075ba9cc7249e19412d3d62f7f94839c4 F src/mutex_noop.c 9d4309c075ba9cc7249e19412d3d62f7f94839c4
F src/mutex_unix.c 27bb6cc49485ee46711a6580ab7b3f1402211d23 F src/mutex_unix.c 27bb6cc49485ee46711a6580ab7b3f1402211d23
F src/mutex_w32.c 5e6fe1c298fb5a8a15aaed4161d5759311431c17 F src/mutex_w32.c 5e6fe1c298fb5a8a15aaed4161d5759311431c17
F src/notify.c 9711a7575036f0d3040ba61bc6e217f13a9888e7 F src/notify.c 9711a7575036f0d3040ba61bc6e217f13a9888e7
F src/os.c 4d83917f072ad958fba9235136fa2ed43df47905 F src/os.c add02933b1dce7a39a005b00a2f5364b763e9a24
F src/os.h 8e976e59eb4ca1c0fca6d35ee803e38951cb0343 F src/os.h 8e976e59eb4ca1c0fca6d35ee803e38951cb0343
F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
F src/os_unix.c a9443cdab41d7f3cdf0df3a5aab62fd6e1c9b234 F src/os_unix.c a9443cdab41d7f3cdf0df3a5aab62fd6e1c9b234
F src/os_win.c 716af57117381c24c0eb43c8dc5a86a6496f98a7 F src/os_win.c 520f23475f1de530c435d30b67b7b15fe90874b0
F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
F src/pager.c c368634b888b1c8740aea83b36bfd266f2443e60 F src/pager.c c368634b888b1c8740aea83b36bfd266f2443e60
F src/pager.h 8ab6b6feeee4bc0439bfde7ee59ba99df98b9bc3 F src/pager.h 031a87445e5e0afc85312d1c380e123ad6c7aeaf
F src/parse.y f374ab20106362eb3f5c01b3e6a002f0bbead7ff F src/parse.y f374ab20106362eb3f5c01b3e6a002f0bbead7ff
F src/pcache.c 5583c8ade4b05075a60ba953ef471d1c1a9c05df F src/pcache.c 5583c8ade4b05075a60ba953ef471d1c1a9c05df
F src/pcache.h 2cedcd8407eb23017d92790b112186886e179490 F src/pcache.h 2cedcd8407eb23017d92790b112186886e179490
@ -385,10 +385,10 @@ F src/resolve.c cca3aa77b95706df5d635a2141a4d1de60ae6598
F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
F src/select.c f3c6e9065fb34f6a23af27ec7f1f717ffbfc2ee4 F src/select.c f3c6e9065fb34f6a23af27ec7f1f717ffbfc2ee4
F src/shell.c 14ff7f660530a52b117d110ba3390b7b2eb719b6 F src/shell.c 14ff7f660530a52b117d110ba3390b7b2eb719b6
F src/sqlite.h.in 5e6785f6d2148b20ecd891039b12e9c7b8c552ca F src/sqlite.h.in b9ba728c1083b7a8ab5f6a628b25cd2a00325fbf
F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
F src/sqlite3ext.h 98f72cbfe00169c39089115427d06ea05fe4b4a2 F src/sqlite3ext.h 2a170163d121095c6ab1ef05ed0413722f391d01
F src/sqliteInt.h 2ac73e9fdd138f4607139d9bd6a1e6dcd01837dc F src/sqliteInt.h dcf43b8abc5605b70f54ba80f42b6ad054b8ba95
F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247 F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
F src/status.c 5b18f9526900f61189ab0b83f1ef41d9f871a2ab F src/status.c 5b18f9526900f61189ab0b83f1ef41d9f871a2ab
F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9 F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
@ -416,12 +416,12 @@ F src/test_func.c 37453d346cfcf118774efd5bf6187f7e6a7e3254
F src/test_hexio.c abfdecb6fa58c354623978efceb088ca18e379cd F src/test_hexio.c abfdecb6fa58c354623978efceb088ca18e379cd
F src/test_init.c 66b33120ffe9cd853b5a905ec850d51151337b32 F src/test_init.c 66b33120ffe9cd853b5a905ec850d51151337b32
F src/test_intarray.c 870124b95ec4c645d4eb84f15efb7133528fb1a5 F src/test_intarray.c 870124b95ec4c645d4eb84f15efb7133528fb1a5
F src/test_intarray.h 9dc57417fb65bc7835cc18548852cc08cc062202 F src/test_intarray.h f3b7672f5d1056eac563c0d6ea8480a660b1475c
F src/test_journal.c d3b83f2bcb7792c709e57abddc456a2b1818643a F src/test_journal.c d3b83f2bcb7792c709e57abddc456a2b1818643a
F src/test_loadext.c 337056bae59f80b9eb00ba82088b39d0f4fe6dfd F src/test_loadext.c 337056bae59f80b9eb00ba82088b39d0f4fe6dfd
F src/test_malloc.c 6b27e947eeeb70d11aa65406ed28d749e39b6356 F src/test_malloc.c 6b27e947eeeb70d11aa65406ed28d749e39b6356
F src/test_multiplex.c eafc567ebe162e36f17b5062285dfe90461cf8e9 F src/test_multiplex.c eafc567ebe162e36f17b5062285dfe90461cf8e9
F src/test_multiplex.h c08e4e8f8651f0c5e0509b138ff4d5b43ed1f5d3 F src/test_multiplex.h 5436d03f2d0501d04f3ed50a75819e190495b635
F src/test_mutex.c dbdfaff8580071f2212a0deae3325a93a737819c F src/test_mutex.c dbdfaff8580071f2212a0deae3325a93a737819c
F src/test_onefile.c 416f87a28d6d673352d33fc4b1c7d39db878e50f F src/test_onefile.c 416f87a28d6d673352d33fc4b1c7d39db878e50f
F src/test_osinst.c ad0233b1dabb0390e25edded4ebd79a2a61538c6 F src/test_osinst.c ad0233b1dabb0390e25edded4ebd79a2a61538c6
@ -450,8 +450,8 @@ F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
F src/util.c 810ec3f22e2d1b62e66c30fe3621ebdedd23584d F src/util.c 810ec3f22e2d1b62e66c30fe3621ebdedd23584d
F src/vacuum.c feb1eabb20987983d9350cad98299b21fa811f52 F src/vacuum.c feb1eabb20987983d9350cad98299b21fa811f52
F src/vdbe.c 22b46c3b725e950e9f2760e2d76953d592600ad4 F src/vdbe.c 22b46c3b725e950e9f2760e2d76953d592600ad4
F src/vdbe.h 5591b5add447096e31288b5a0a78ec5d7b5c5170 F src/vdbe.h 67bc551f7faf04c33493892e4b378aada823ed10
F src/vdbeInt.h ddb157974436d87652de7dc641f7191496d9a8cd F src/vdbeInt.h c59381049af5c7751a83456c39b80d1a6fde1f9d
F src/vdbeapi.c 02bcbc2ca5d2004b029088b05b468b394881e103 F src/vdbeapi.c 02bcbc2ca5d2004b029088b05b468b394881e103
F src/vdbeaux.c c90275b0e55a2b32c03dc09314194fe46f2429d8 F src/vdbeaux.c c90275b0e55a2b32c03dc09314194fe46f2429d8
F src/vdbeblob.c 83d2d266383157b02e2b809350bb197e89d7895b F src/vdbeblob.c 83d2d266383157b02e2b809350bb197e89d7895b
@ -461,7 +461,7 @@ F src/vdbetrace.c f75c5455d8cf389ef86a8bfdfd3177e0e3692484
F src/vtab.c 948d2d4984219eee37a7bf427d6667e21e6eb92e F src/vtab.c 948d2d4984219eee37a7bf427d6667e21e6eb92e
F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9 F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
F src/wal.c 02eeecc265f6ffd0597378f5d8ae9070b62a406a F src/wal.c 02eeecc265f6ffd0597378f5d8ae9070b62a406a
F src/wal.h 2f7c831cf3b071fa548bf2d5cac640846a7ff19c F src/wal.h 6dd221ed384afdc204bc61e25c23ef7fd5a511f2
F src/walker.c 0f142b5bd3ed2041fc52d773880748b212e63354 F src/walker.c 0f142b5bd3ed2041fc52d773880748b212e63354
F src/where.c 48eed8ebe319c6cbc7bf7682018f32af0f5189f5 F src/where.c 48eed8ebe319c6cbc7bf7682018f32af0f5189f5
F src/whereInt.h e5b939701a7ceffc5a3a8188a37f9746416ebcd0 F src/whereInt.h e5b939701a7ceffc5a3a8188a37f9746416ebcd0
@ -1505,7 +1505,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
P e1d8ef311cabcb96495a88404991b1416655e4a8 549abe3f89b55b05a05f267865a5dd84b8cd335d P b5f32a896d0e4010ec67fcf1d635bb9aa797d3c2
R ba3e2959766a1594f290917f0109fdb1 R 1420ae412f251bd23536749aacd8c4fa
U drh U drh
Z f61bb876686c2e3e621a4eb92a4f2f5a Z e116500fbf8eef00f67c7f388726b705

2
manifest.uuid
View File

@ -1 +1 @@
b5f32a896d0e4010ec67fcf1d635bb9aa797d3c2 5471aca0158851d3fb0a2517306917536deb38bb

6
src/btree.h
View File

@ -13,8 +13,8 @@
** subsystem. See comments in the source code for a detailed description ** subsystem. See comments in the source code for a detailed description
** of what each interface routine does. ** of what each interface routine does.
*/ */
#ifndef _BTREE_H_ #ifndef SQLITE_BTREE_H
#define _BTREE_H_ #define SQLITE_BTREE_H
/* TODO: This definition is just included so other modules compile. It /* TODO: This definition is just included so other modules compile. It
** needs to be revisited. ** needs to be revisited.
@ -359,4 +359,4 @@ void sqlite3BtreeCursorList(Btree*);
#endif #endif
#endif /* _BTREE_H_ */ #endif /* SQLITE_BTREE_H */

6
src/hash.h
View File

@ -12,8 +12,8 @@
** This is the header file for the generic hash-table implementation ** This is the header file for the generic hash-table implementation
** used in SQLite. ** used in SQLite.
*/ */
#ifndef _SQLITE_HASH_H_ #ifndef SQLITE_HASH_H
#define _SQLITE_HASH_H_ #define SQLITE_HASH_H
/* Forward declarations of structures. */ /* Forward declarations of structures. */
typedef struct Hash Hash; typedef struct Hash Hash;
@ -93,4 +93,4 @@ void sqlite3HashClear(Hash*);
*/ */
/* #define sqliteHashCount(H) ((H)->count) // NOT USED */ /* #define sqliteHashCount(H) ((H)->count) // NOT USED */
#endif /* _SQLITE_HASH_H_ */ #endif /* SQLITE_HASH_H */

6
src/hwtime.h
View File

@ -13,8 +13,8 @@
** This file contains inline asm code for retrieving "high-performance" ** This file contains inline asm code for retrieving "high-performance"
** counters for x86 class CPUs. ** counters for x86 class CPUs.
*/ */
#ifndef _HWTIME_H_ #ifndef SQLITE_HWTIME_H
#define _HWTIME_H_ #define SQLITE_HWTIME_H
/* /*
** The following routine only works on pentium-class (or newer) processors. ** The following routine only works on pentium-class (or newer) processors.
@ -82,4 +82,4 @@
#endif #endif
#endif /* !defined(_HWTIME_H_) */ #endif /* !defined(SQLITE_HWTIME_H) */

6
src/msvc.h
View File

@ -12,8 +12,8 @@
** **
** This file contains code that is specific to MSVC. ** This file contains code that is specific to MSVC.
*/ */
#ifndef _MSVC_H_ #ifndef SQLITE_MSVC_H
#define _MSVC_H_ #define SQLITE_MSVC_H
#if defined(_MSC_VER) #if defined(_MSC_VER)
#pragma warning(disable : 4054) #pragma warning(disable : 4054)
@ -33,4 +33,4 @@
#pragma warning(disable : 4706) #pragma warning(disable : 4706)
#endif /* defined(_MSC_VER) */ #endif /* defined(_MSC_VER) */
#endif /* _MSVC_H_ */ #endif /* SQLITE_MSVC_H */

2
src/os.c
View File

@ -13,9 +13,7 @@
** This file contains OS interface code that is common to all ** This file contains OS interface code that is common to all
** architectures. ** architectures.
*/ */
#define _SQLITE_OS_C_ 1
#include "sqliteInt.h" #include "sqliteInt.h"
#undef _SQLITE_OS_C_
/* /*
** If we compile with the SQLITE_TEST macro set, then the following block ** If we compile with the SQLITE_TEST macro set, then the following block

6
src/os_setup.h
View File

@ -13,8 +13,8 @@
** This file contains pre-processor directives related to operating system ** This file contains pre-processor directives related to operating system
** detection and/or setup. ** detection and/or setup.
*/ */
#ifndef _OS_SETUP_H_ #ifndef SQLITE_OS_SETUP_H
#define _OS_SETUP_H_ #define SQLITE_OS_SETUP_H
/* /*
** Figure out if we are dealing with Unix, Windows, or some other operating ** Figure out if we are dealing with Unix, Windows, or some other operating
@ -54,4 +54,4 @@
# endif # endif
#endif #endif
#endif /* _OS_SETUP_H_ */ #endif /* SQLITE_OS_SETUP_H */

28
src/os_win.c
View File

@ -3675,12 +3675,12 @@ struct winShm {
/* /*
** Apply advisory locks for all n bytes beginning at ofst. ** Apply advisory locks for all n bytes beginning at ofst.
*/ */
#define _SHM_UNLCK 1 #define WINSHM_UNLCK 1
#define _SHM_RDLCK 2 #define WINSHM_RDLCK 2
#define _SHM_WRLCK 3 #define WINSHM_WRLCK 3
static int winShmSystemLock( static int winShmSystemLock(
winShmNode *pFile, /* Apply locks to this open shared-memory segment */ winShmNode *pFile, /* Apply locks to this open shared-memory segment */
int lockType, /* _SHM_UNLCK, _SHM_RDLCK, or _SHM_WRLCK */ int lockType, /* WINSHM_UNLCK, WINSHM_RDLCK, or WINSHM_WRLCK */
int ofst, /* Offset to first byte to be locked/unlocked */ int ofst, /* Offset to first byte to be locked/unlocked */
int nByte /* Number of bytes to lock or unlock */ int nByte /* Number of bytes to lock or unlock */
){ ){
@ -3693,12 +3693,12 @@ static int winShmSystemLock(
pFile->hFile.h, lockType, ofst, nByte)); pFile->hFile.h, lockType, ofst, nByte));
/* Release/Acquire the system-level lock */ /* Release/Acquire the system-level lock */
if( lockType==_SHM_UNLCK ){ if( lockType==WINSHM_UNLCK ){
rc = winUnlockFile(&pFile->hFile.h, ofst, 0, nByte, 0); rc = winUnlockFile(&pFile->hFile.h, ofst, 0, nByte, 0);
}else{ }else{
/* Initialize the locking parameters */ /* Initialize the locking parameters */
DWORD dwFlags = LOCKFILE_FAIL_IMMEDIATELY; DWORD dwFlags = LOCKFILE_FAIL_IMMEDIATELY;
if( lockType == _SHM_WRLCK ) dwFlags |= LOCKFILE_EXCLUSIVE_LOCK; if( lockType == WINSHM_WRLCK ) dwFlags |= LOCKFILE_EXCLUSIVE_LOCK;
rc = winLockFile(&pFile->hFile.h, dwFlags, ofst, 0, nByte, 0); rc = winLockFile(&pFile->hFile.h, dwFlags, ofst, 0, nByte, 0);
} }
@ -3710,7 +3710,7 @@ static int winShmSystemLock(
} }
OSTRACE(("SHM-LOCK file=%p, func=%s, errno=%lu, rc=%s\n", OSTRACE(("SHM-LOCK file=%p, func=%s, errno=%lu, rc=%s\n",
pFile->hFile.h, (lockType == _SHM_UNLCK) ? "winUnlockFile" : pFile->hFile.h, (lockType == WINSHM_UNLCK) ? "winUnlockFile" :
"winLockFile", pFile->lastErrno, sqlite3ErrName(rc))); "winLockFile", pFile->lastErrno, sqlite3ErrName(rc)));
return rc; return rc;
@ -3838,7 +3838,7 @@ static int winOpenSharedMemory(winFile *pDbFd){
/* Check to see if another process is holding the dead-man switch. /* Check to see if another process is holding the dead-man switch.
** If not, truncate the file to zero length. ** If not, truncate the file to zero length.
*/ */
if( winShmSystemLock(pShmNode, _SHM_WRLCK, WIN_SHM_DMS, 1)==SQLITE_OK ){ if( winShmSystemLock(pShmNode, WINSHM_WRLCK, WIN_SHM_DMS, 1)==SQLITE_OK ){
rc = winTruncate((sqlite3_file *)&pShmNode->hFile, 0); rc = winTruncate((sqlite3_file *)&pShmNode->hFile, 0);
if( rc!=SQLITE_OK ){ if( rc!=SQLITE_OK ){
rc = winLogError(SQLITE_IOERR_SHMOPEN, osGetLastError(), rc = winLogError(SQLITE_IOERR_SHMOPEN, osGetLastError(),
@ -3846,8 +3846,8 @@ static int winOpenSharedMemory(winFile *pDbFd){
} }
} }
if( rc==SQLITE_OK ){ if( rc==SQLITE_OK ){
winShmSystemLock(pShmNode, _SHM_UNLCK, WIN_SHM_DMS, 1); winShmSystemLock(pShmNode, WINSHM_UNLCK, WIN_SHM_DMS, 1);
rc = winShmSystemLock(pShmNode, _SHM_RDLCK, WIN_SHM_DMS, 1); rc = winShmSystemLock(pShmNode, WINSHM_RDLCK, WIN_SHM_DMS, 1);
} }
if( rc ) goto shm_open_err; if( rc ) goto shm_open_err;
} }
@ -3876,7 +3876,7 @@ static int winOpenSharedMemory(winFile *pDbFd){
/* Jump here on any error */ /* Jump here on any error */
shm_open_err: shm_open_err:
winShmSystemLock(pShmNode, _SHM_UNLCK, WIN_SHM_DMS, 1); winShmSystemLock(pShmNode, WINSHM_UNLCK, WIN_SHM_DMS, 1);
winShmPurge(pDbFd->pVfs, 0); /* This call frees pShmNode if required */ winShmPurge(pDbFd->pVfs, 0); /* This call frees pShmNode if required */
sqlite3_free(p); sqlite3_free(p);
sqlite3_free(pNew); sqlite3_free(pNew);
@ -3965,7 +3965,7 @@ static int winShmLock(
/* Unlock the system-level locks */ /* Unlock the system-level locks */
if( (mask & allMask)==0 ){ if( (mask & allMask)==0 ){
rc = winShmSystemLock(pShmNode, _SHM_UNLCK, ofst+WIN_SHM_BASE, n); rc = winShmSystemLock(pShmNode, WINSHM_UNLCK, ofst+WIN_SHM_BASE, n);
}else{ }else{
rc = SQLITE_OK; rc = SQLITE_OK;
} }
@ -3993,7 +3993,7 @@ static int winShmLock(
/* Get shared locks at the system level, if necessary */ /* Get shared locks at the system level, if necessary */
if( rc==SQLITE_OK ){ if( rc==SQLITE_OK ){
if( (allShared & mask)==0 ){ if( (allShared & mask)==0 ){
rc = winShmSystemLock(pShmNode, _SHM_RDLCK, ofst+WIN_SHM_BASE, n); rc = winShmSystemLock(pShmNode, WINSHM_RDLCK, ofst+WIN_SHM_BASE, n);
}else{ }else{
rc = SQLITE_OK; rc = SQLITE_OK;
} }
@ -4018,7 +4018,7 @@ static int winShmLock(
** also mark the local connection as being locked. ** also mark the local connection as being locked.
*/ */
if( rc==SQLITE_OK ){ if( rc==SQLITE_OK ){
rc = winShmSystemLock(pShmNode, _SHM_WRLCK, ofst+WIN_SHM_BASE, n); rc = winShmSystemLock(pShmNode, WINSHM_WRLCK, ofst+WIN_SHM_BASE, n);
if( rc==SQLITE_OK ){ if( rc==SQLITE_OK ){
assert( (p->sharedMask & mask)==0 ); assert( (p->sharedMask & mask)==0 );
p->exclMask |= mask; p->exclMask |= mask;

6
src/os_win.h
View File

@ -12,8 +12,8 @@
** **
** This file contains code that is specific to Windows. ** This file contains code that is specific to Windows.
*/ */
#ifndef _OS_WIN_H_ #ifndef SQLITE_OS_WIN_H
#define _OS_WIN_H_ #define SQLITE_OS_WIN_H
/* /*
** Include the primary Windows SDK header file. ** Include the primary Windows SDK header file.
@ -85,4 +85,4 @@
# define SQLITE_OS_WIN_THREADS 0 # define SQLITE_OS_WIN_THREADS 0
#endif #endif
#endif /* _OS_WIN_H_ */ #endif /* SQLITE_OS_WIN_H */

6
src/pager.h
View File

@ -14,8 +14,8 @@
** at a time and provides a journal for rollback. ** at a time and provides a journal for rollback.
*/ */
#ifndef _PAGER_H_ #ifndef SQLITE_PAGER_H
#define _PAGER_H_ #define SQLITE_PAGER_H
/* /*
** Default maximum size for persistent journal files. A negative ** Default maximum size for persistent journal files. A negative
@ -229,4 +229,4 @@ void *sqlite3PagerCodec(DbPage *);
# define enable_simulated_io_errors() # define enable_simulated_io_errors()
#endif #endif
#endif /* _PAGER_H_ */ #endif /* SQLITE_PAGER_H */

6
src/sqlite.h.in
View File

@ -30,8 +30,8 @@
** the version number) and changes its name to "sqlite3.h" as ** the version number) and changes its name to "sqlite3.h" as
** part of the build process. ** part of the build process.
*/ */
#ifndef _SQLITE3_H_ #ifndef SQLITE3_H
#define _SQLITE3_H_ #define SQLITE3_H
#include <stdarg.h> /* Needed for the definition of va_list */ #include <stdarg.h> /* Needed for the definition of va_list */
/* /*
@ -8218,4 +8218,4 @@ SQLITE_EXPERIMENTAL int sqlite3_snapshot_cmp(
#ifdef __cplusplus #ifdef __cplusplus
} /* End of the 'extern "C"' block */ } /* End of the 'extern "C"' block */
#endif #endif
#endif /* _SQLITE3_H_ */ #endif /* SQLITE3_H */

6
src/sqlite3ext.h
View File

@ -15,8 +15,8 @@
** as extensions by SQLite should #include this file instead of ** as extensions by SQLite should #include this file instead of
** sqlite3.h. ** sqlite3.h.
*/ */
#ifndef _SQLITE3EXT_H_ #ifndef SQLITE3EXT_H
#define _SQLITE3EXT_H_ #define SQLITE3EXT_H
#include "sqlite3.h" #include "sqlite3.h"
typedef struct sqlite3_api_routines sqlite3_api_routines; typedef struct sqlite3_api_routines sqlite3_api_routines;
@ -543,4 +543,4 @@ struct sqlite3_api_routines {
# define SQLITE_EXTENSION_INIT3 /*no-op*/ # define SQLITE_EXTENSION_INIT3 /*no-op*/
#endif #endif
#endif /* _SQLITE3EXT_H_ */ #endif /* SQLITE3EXT_H */

6
src/sqliteInt.h
View File

@ -12,8 +12,8 @@
** Internal interface definitions for SQLite. ** Internal interface definitions for SQLite.
** **
*/ */
#ifndef _SQLITEINT_H_ #ifndef SQLITEINT_H
#define _SQLITEINT_H_ #define SQLITEINT_H
/* Special Comments: /* Special Comments:
** **
@ -4237,4 +4237,4 @@ int sqlite3ThreadJoin(SQLiteThread*, void**);
int sqlite3DbstatRegister(sqlite3*); int sqlite3DbstatRegister(sqlite3*);
#endif #endif
#endif /* _SQLITEINT_H_ */ #endif /* SQLITEINT_H */

6
src/test_intarray.h
View File

@ -75,8 +75,8 @@
** action to free the intarray objects. ** action to free the intarray objects.
*/ */
#include "sqlite3.h" #include "sqlite3.h"
#ifndef _INTARRAY_H_ #ifndef SQLITE_INTARRAY_H
#define _INTARRAY_H_ #define SQLITE_INTARRAY_H
/* /*
** Make sure we can call this stuff from C++. ** Make sure we can call this stuff from C++.
@ -125,4 +125,4 @@ SQLITE_API int sqlite3_intarray_bind(
#ifdef __cplusplus #ifdef __cplusplus
} /* End of the 'extern "C"' block */ } /* End of the 'extern "C"' block */
#endif #endif
#endif /* _INTARRAY_H_ */ #endif /* SQLITE_INTARRAY_H */

6
src/test_multiplex.h
View File

@ -20,8 +20,8 @@
** **
*/ */
#ifndef _TEST_MULTIPLEX_H #ifndef SQLITE_TEST_MULTIPLEX_H
#define _TEST_MULTIPLEX_H #define SQLITE_TEST_MULTIPLEX_H
/* /*
** CAPI: File-control Operations Supported by Multiplex VFS ** CAPI: File-control Operations Supported by Multiplex VFS
@ -96,4 +96,4 @@ extern int sqlite3_multiplex_shutdown(int eForce);
} /* End of the 'extern "C"' block */ } /* End of the 'extern "C"' block */
#endif #endif
#endif /* _TEST_MULTIPLEX_H */ #endif /* SQLITE_TEST_MULTIPLEX_H */

6
src/vdbe.h
View File

@ -15,8 +15,8 @@
** or VDBE. The VDBE implements an abstract machine that runs a ** or VDBE. The VDBE implements an abstract machine that runs a
** simple program to access and modify the underlying database. ** simple program to access and modify the underlying database.
*/ */
#ifndef _SQLITE_VDBE_H_ #ifndef SQLITE_VDBE_H
#define _SQLITE_VDBE_H_ #define SQLITE_VDBE_H
#include <stdio.h> #include <stdio.h>
/* /*
@ -309,4 +309,4 @@ void sqlite3VdbeScanStatus(Vdbe*, int, int, int, LogEst, const char*);
# define sqlite3VdbeScanStatus(a,b,c,d,e) # define sqlite3VdbeScanStatus(a,b,c,d,e)
#endif #endif
#endif #endif /* SQLITE_VDBE_H */

6
src/vdbeInt.h
View File

@ -15,8 +15,8 @@
** 6000 lines long) it was split up into several smaller files and ** 6000 lines long) it was split up into several smaller files and
** this header information was factored out. ** this header information was factored out.
*/ */
#ifndef _VDBEINT_H_ #ifndef SQLITE_VDBEINT_H
#define _VDBEINT_H_ #define SQLITE_VDBEINT_H
/* /*
** The maximum number of times that a statement will try to reparse ** The maximum number of times that a statement will try to reparse
@ -558,4 +558,4 @@ int sqlite3VdbeMemHandleBom(Mem *pMem);
#define ExpandBlob(P) SQLITE_OK #define ExpandBlob(P) SQLITE_OK
#endif #endif
#endif /* !defined(_VDBEINT_H_) */ #endif /* !defined(SQLITE_VDBEINT_H) */

6
src/wal.h
View File

@ -14,8 +14,8 @@
** the implementation of each function in log.c for further details. ** the implementation of each function in log.c for further details.
*/ */
#ifndef _WAL_H_ #ifndef SQLITE_WAL_H
#define _WAL_H_ #define SQLITE_WAL_H
#include "sqliteInt.h" #include "sqliteInt.h"
@ -143,4 +143,4 @@ int sqlite3WalFramesize(Wal *pWal);
sqlite3_file *sqlite3WalFile(Wal *pWal); sqlite3_file *sqlite3WalFile(Wal *pWal);
#endif /* ifndef SQLITE_OMIT_WAL */ #endif /* ifndef SQLITE_OMIT_WAL */
#endif /* _WAL_H_ */ #endif /* SQLITE_WAL_H */