database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-12 13:01:09 +03:00
Code Activity

Do not call gethostuuid() on MacOS 10.4 and earlier, since it is not

Browse Source 
supported there.

FossilOrigin-Name: 44deaaefeeb95827daeaf84aa5e205b456e75b40
This commit is contained in:
drh
2010-09-25 14:13:17 +00:00
parent 56f0571ff7
commit e8b0c9b4ee
3 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
manifest
View File

@@ -1,5 +1,8 @@
C Add\stests\sto\sfile\se_reindex.test. -----BEGIN PGP SIGNED MESSAGE-----
D 2010-09-25T07:51:58 Hash: SHA1
C Do\snot\scall\sgethostuuid()\son\sMacOS\s10.4\sand\searlier,\ssince\sit\sis\snot\nsupported\sthere.
D 2010-09-25T14:13:18
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in c599a15d268b1db2aeadea19df2adc3bf2eb6bee F Makefile.in c599a15d268b1db2aeadea19df2adc3bf2eb6bee
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -159,7 +162,7 @@ F src/os.c 22ac61d06e72a0dac900400147333b07b13d8e1d
F src/os.h 9dbed8c2b9c1f2f2ebabc09e49829d4777c26bf9 F src/os.h 9dbed8c2b9c1f2f2ebabc09e49829d4777c26bf9
F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f
F src/os_os2.c 72d0b2e562952a2464308c4ce5f7913ac10bef3e F src/os_os2.c 72d0b2e562952a2464308c4ce5f7913ac10bef3e
F src/os_unix.c 6152042c3a619fbc390eeb59a8eecafa40afc2e4 F src/os_unix.c dd62c4b204fdf8a3804e28c7b09bcea98359ca53
F src/os_win.c 2f90f7bdec714fad51cd31b4ecad3cc1b4bb5aad F src/os_win.c 2f90f7bdec714fad51cd31b4ecad3cc1b4bb5aad
F src/pager.c 4760042267a002216c208aeaa7fc6d0a85df94a5 F src/pager.c 4760042267a002216c208aeaa7fc6d0a85df94a5
F src/pager.h 8167a1e720d0b7a2790079007128e594010220ad F src/pager.h 8167a1e720d0b7a2790079007128e594010220ad
@@ -866,7 +869,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
P f44de500be5130d5ad800759acb76377eaa92367 P eec7dc9192c635335a4a9acc3669afd4b26f02d3
R a1a3a4e3969cb2b2caea2f24a8289e52 R 0e8bdcf793e4dc8e71e78bbd4ff15fee
U dan U drh
Z 9c46bcafe300f163a2067cd0d7ffbcd2 Z 0334baf93c138321128000518775f354
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFMngOBoxKgR168RlERAvcOAJ4zR7ZWTqvsewGnEX3opnyqWbw2KgCbBt9d
hy4yAdhgPfd7y+2N/GngRag=
=2MYR
-----END PGP SIGNATURE-----

2
manifest.uuid
View File

@@ -1 +1 @@
eec7dc9192c635335a4a9acc3669afd4b26f02d3 44deaaefeeb95827daeaf84aa5e205b456e75b40

3
src/os_unix.c
View File

@@ -5382,6 +5382,8 @@ static int proxyGetHostID(unsigned char *pHostID, int *pError){
assert(PROXY_HOSTIDLEN == sizeof(uuid_t)); assert(PROXY_HOSTIDLEN == sizeof(uuid_t));
memset(pHostID, 0, PROXY_HOSTIDLEN); memset(pHostID, 0, PROXY_HOSTIDLEN);
#if defined(__MAX_OS_X_VERSION_MIN_REQUIRED)\
&& __MAC_OS_X_VERSION_MIN_REQUIRED<1050
if( gethostuuid(pHostID, &timeout) ){ if( gethostuuid(pHostID, &timeout) ){
int err = errno; int err = errno;
if( pError ){ if( pError ){
@@ -5389,6 +5391,7 @@ static int proxyGetHostID(unsigned char *pHostID, int *pError){
} }
return SQLITE_IOERR; return SQLITE_IOERR;
} }
#endif
#ifdef SQLITE_TEST #ifdef SQLITE_TEST
/* simulate multiple hosts by creating unique hostid file paths */ /* simulate multiple hosts by creating unique hostid file paths */
if( sqlite3_hostid_num != 0){ if( sqlite3_hostid_num != 0){