SQLite: Check-in [9552de8f]

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

Overview

Comment:	Fix an undefined variable on non-Mac builds.
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| apple-osx
Files:	files \| file ages \| folders
SHA1:	9552de8fb5ec7554c989edc138c0324c5fd0a206
User & Date:	drh 2009-11-05 18:31:56

Context

2009-11-09
19:30		Fix for lock structure sharing with AFP-style locking check-in: 62f15c0a user: adam tags: apple-osx
2009-11-05
18:31		Fix an undefined variable on non-Mac builds. check-in: 9552de8f user: drh tags: apple-osx
2009-11-03
22:34		Customizations for OSX contributed by Apple. check-in: 941a01eb user: adam tags: apple-osx

Changes

Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/os_unix.c.

  3753   3753       /* Cache zFilename in the locking context (AFP and dotlock override) for
  3754   3754       ** proxyLock activation is possible (remote proxy is based on db name)
  3755   3755       ** zFilename remains valid until file is closed, to support */
  3756   3756       pNew->lockingContext = (void*)zFilename;
  3757   3757   #endif
  3758   3758     }
  3759   3759   
  3760         -  if( pLockingStyle == &posixIoMethods || pLockingStyle == &nfsIoMethods ){
         3760  +  if( pLockingStyle == &posixIoMethods
         3761  +#if defined(__APPLE__) && SQLITE_ENABLE_LOCKING_STYLE
         3762  +    || pLockingStyle == &nfsIoMethods
         3763  +#endif
         3764  +  ){
  3761   3765       unixEnterMutex();
  3762   3766       rc = findLockInfo(pNew, &pNew->pLock, &pNew->pOpen);
  3763   3767       if( rc!=SQLITE_OK ){
  3764   3768         /* If an error occured in findLockInfo(), close the file descriptor
  3765   3769         ** immediately, before releasing the mutex. findLockInfo() may fail
  3766   3770         ** in two scenarios:
  3767   3771         **