diff options
| author | drh <drh@noemail.net> | 2010-09-25 14:13:17 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2010-09-25 14:13:17 +0000 |
| commit | e8b0c9b4eebbf73a281cba181542151ce682500e (patch) | |
| tree | 136193ef262af8cadef77e0d12c3cca068f7e759 | |
| parent | 56f0571ff7ed2ce7927052ade3a9ed44cce8f96c (diff) | |
| download | sqlite-e8b0c9b4eebbf73a281cba181542151ce682500e.tar.gz sqlite-e8b0c9b4eebbf73a281cba181542151ce682500e.zip | |
Do not call gethostuuid() on MacOS 10.4 and earlier, since it is not
supported there.
FossilOrigin-Name: 44deaaefeeb95827daeaf84aa5e205b456e75b40
| -rw-r--r-- | manifest | 24 | ||||
| -rw-r--r-- | manifest.uuid | 2 | ||||
| -rw-r--r-- | src/os_unix.c | 3 |
3 files changed, 21 insertions, 8 deletions
@@ -1,5 +1,8 @@ -C Add\stests\sto\sfile\se_reindex.test. -D 2010-09-25T07:51:58 +-----BEGIN PGP SIGNED MESSAGE----- +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.in c599a15d268b1db2aeadea19df2adc3bf2eb6bee F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -159,7 +162,7 @@ F src/os.c 22ac61d06e72a0dac900400147333b07b13d8e1d F src/os.h 9dbed8c2b9c1f2f2ebabc09e49829d4777c26bf9 F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f 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/pager.c 4760042267a002216c208aeaa7fc6d0a85df94a5 F src/pager.h 8167a1e720d0b7a2790079007128e594010220ad @@ -866,7 +869,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f -P f44de500be5130d5ad800759acb76377eaa92367 -R a1a3a4e3969cb2b2caea2f24a8289e52 -U dan -Z 9c46bcafe300f163a2067cd0d7ffbcd2 +P eec7dc9192c635335a4a9acc3669afd4b26f02d3 +R 0e8bdcf793e4dc8e71e78bbd4ff15fee +U drh +Z 0334baf93c138321128000518775f354 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.6 (GNU/Linux) + +iD8DBQFMngOBoxKgR168RlERAvcOAJ4zR7ZWTqvsewGnEX3opnyqWbw2KgCbBt9d +hy4yAdhgPfd7y+2N/GngRag= +=2MYR +-----END PGP SIGNATURE----- diff --git a/manifest.uuid b/manifest.uuid index 019693c2b..714e8e709 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -eec7dc9192c635335a4a9acc3669afd4b26f02d3
\ No newline at end of file +44deaaefeeb95827daeaf84aa5e205b456e75b40
\ No newline at end of file diff --git a/src/os_unix.c b/src/os_unix.c index e0b61f978..f1a65949f 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -5382,6 +5382,8 @@ static int proxyGetHostID(unsigned char *pHostID, int *pError){ assert(PROXY_HOSTIDLEN == sizeof(uuid_t)); memset(pHostID, 0, PROXY_HOSTIDLEN); +#if defined(__MAX_OS_X_VERSION_MIN_REQUIRED)\ + && __MAC_OS_X_VERSION_MIN_REQUIRED<1050 if( gethostuuid(pHostID, &timeout) ){ int err = errno; if( pError ){ @@ -5389,6 +5391,7 @@ static int proxyGetHostID(unsigned char *pHostID, int *pError){ } return SQLITE_IOERR; } +#endif #ifdef SQLITE_TEST /* simulate multiple hosts by creating unique hostid file paths */ if( sqlite3_hostid_num != 0){ |