[svn] GnuPG - r4804 - branches/STABLE-BRANCH-1-4/g10

[svn author wk]

Author: wk
Date: 2008-08-01 12:48:36 +0200 (Fri, 01 Aug 2008)
New Revision: 4804

Modified:
   branches/STABLE-BRANCH-1-4/g10/ChangeLog
   branches/STABLE-BRANCH-1-4/g10/tdbio.c
Log:
Fix !EROFS bug


Modified: branches/STABLE-BRANCH-1-4/g10/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/ChangeLog	2008-07-30 10:25:18 UTC (rev 4803)
+++ branches/STABLE-BRANCH-1-4/g10/ChangeLog	2008-08-01 10:48:36 UTC (rev 4804)
@@ -1,3 +1,8 @@
+2008-08-01  Werner Koch  <wk at g10code.com>
+
+	* tdbio.c (open_db) [!EROFS]: Move closing parens out of the
+	ifdef.  Reported by Ken Takusagawa.
+
 2008-04-30  Werner Koch  <wk at g10code.com>
 
 	* getkey.c (parse_auto_key_locate): Ignore nodefault and local

Modified: branches/STABLE-BRANCH-1-4/g10/tdbio.c
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/tdbio.c	2008-07-30 10:25:18 UTC (rev 4803)
+++ branches/STABLE-BRANCH-1-4/g10/tdbio.c	2008-08-01 10:48:36 UTC (rev 4804)
@@ -592,8 +592,9 @@
   db_fd = open (db_name, O_RDWR | MY_O_BINARY );
   if (db_fd == -1 && (errno == EACCES
 #ifdef EROFS
-                      || errno == EROFS)
+                      || errno == EROFS
 #endif
+                      )
       ) {
       db_fd = open (db_name, O_RDONLY | MY_O_BINARY );
       if (db_fd != -1)