From: drh <drh@noemail.net>
Date: Fri, 22 Aug 2008 00:47:53 +0000 (+0000)
Subject: Fix os_unix.c so that it will compile on Linux again. (CVS 5588)
X-Git-Tag: version-3.6.10~589
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f489c45a63f346dc81db2c6e5d18a7be2d47f699;p=thirdparty%2Fsqlite.git

Fix os_unix.c so that it will compile on Linux again. (CVS 5588)

FossilOrigin-Name: 2416708208357304904e38b2d36081a1adf5e44b
---

diff --git a/manifest b/manifest
index 00e122cb06..0522da045d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Deferring\sfile\sdescriptor\sclosing\sto\savoid\strashing\slocks\swhen\sdirectly\smanipulating\ssqlite\sdb\sfile\scontents\s(causes\serrors\son\sAFP\stesting)\s(CVS\s5587)
-D 2008-08-22T00:25:53
+C Fix\sos_unix.c\sso\sthat\sit\swill\scompile\son\sLinux\sagain.\s(CVS\s5588)
+D 2008-08-22T00:47:54
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 51b727303f84cf055e29514d8248e5eaf9701379
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -133,7 +133,7 @@ F src/os.c 939ae7690a01d9401685ba124b4ba45fd4a7a2ad
 F src/os.h ef8abeb9afc694b82dbd169a91c9b7e26db3c892
 F src/os_common.h 24525d8b7bce66c374dfc1810a6c9043f3359b60
 F src/os_os2.c 676ed273b17bd260f905df81375c9f9950d85517
-F src/os_unix.c 9fddf8735f77fec2fdecc09481f4241710dd8c2d
+F src/os_unix.c f1be99705e4542f01830ccea327eb773814f4eb9
 F src/os_win.c aefe9ee26430678a19a058a874e4e2bd91398142
 F src/pager.c 3a4358c72c9c8415e8648001c776857e6952e2b4
 F src/pager.h 3778bea71dfb9658b6c94394e18db4a5b27e6ded
@@ -622,7 +622,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P c1af14e2b6bf5af0aff3df3adbe8cb9aabe1c4a3
-R 020594f125bbbdb48c5aa062c24e5325
-U aswift
-Z 6df8c751714bfb1ec9bdc42c787ab3b8
+P e28a2870b49509502529892ff8ddb9fcf3a27173
+R e06d422a77e6a9b567f419fccc11805c
+U drh
+Z e1dcaa67276ea8bb0343faa68fef8503
diff --git a/manifest.uuid b/manifest.uuid
index 5eddc5cea0..fb67cf65c5 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e28a2870b49509502529892ff8ddb9fcf3a27173
\ No newline at end of file
+2416708208357304904e38b2d36081a1adf5e44b
\ No newline at end of file
diff --git a/src/os_unix.c b/src/os_unix.c
index f78cb7ec85..37dc49a047 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -12,7 +12,7 @@
 **
 ** This file contains code that is specific to Unix systems.
 **
-** $Id: os_unix.c,v 1.196 2008/08/22 00:22:35 aswift Exp $
+** $Id: os_unix.c,v 1.197 2008/08/22 00:47:54 drh Exp $
 */
 #include "sqliteInt.h"
 #if SQLITE_OS_UNIX              /* This file is used on unix only */
@@ -1173,9 +1173,11 @@ static int sqliteErrorFromPosixError(int posixError, int sqliteIOErr) {
   case EDEADLK:
     return SQLITE_IOERR_BLOCKED;
     
+#if EOPNOTSUPP!=ENOTSUP
   case EOPNOTSUPP: 
     /* something went terribly awry, unless during file system support 
      * introspection, in which it actually means what it says */
+#endif
   case ENOTSUP: 
     /* invalid fd, unless during file system support introspection, in which 
      * it actually means what it says */