ph10 2007/08/29 15:02:22 BST
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/src dbstuff.h search.c
Log:
POSIX allows open() to be a macro; guard against it.
Revision Changes Path
1.529 +2 -0 exim/exim-doc/doc-txt/ChangeLog
1.7 +2 -2 exim/exim-src/src/dbstuff.h
1.6 +1 -1 exim/exim-src/src/search.c
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.528
retrieving revision 1.529
diff -u -r1.528 -r1.529
--- ChangeLog 29 Aug 2007 13:58:57 -0000 1.528
+++ ChangeLog 29 Aug 2007 14:02:22 -0000 1.529
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.528 2007/08/29 13:58:57 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.529 2007/08/29 14:02:22 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -99,6 +99,8 @@
PH/22 Guard against possible overflow in moan_check_errorcopy().
+PH/23 POSIX allows open() to be a macro; guard against that.
+
Exim version 4.67
-----------------
Index: dbstuff.h
===================================================================
RCS file: /home/cvs/exim/exim-src/src/dbstuff.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dbstuff.h 8 Jan 2007 10:50:17 -0000 1.6
+++ dbstuff.h 29 Aug 2007 14:02:22 -0000 1.7
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/dbstuff.h,v 1.6 2007/01/08 10:50:17 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/dbstuff.h,v 1.7 2007/08/29 14:02:22 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -135,7 +135,7 @@
#define EXIM_DBOPEN(name, flags, mode, dbpp) \
if (db_create(dbpp, NULL, 0) != 0 || \
((*dbpp)->set_errcall(*dbpp, dbfn_bdb_error_callback), \
- (*dbpp)->open(*dbpp, NULL, CS name, NULL, \
+ ((*dbpp)->open)(*dbpp, NULL, CS name, NULL, \
((flags) == O_RDONLY)? DB_UNKNOWN : DB_HASH, \
((flags) == O_RDONLY)? DB_RDONLY : DB_CREATE, \
mode)) != 0) *(dbpp) = NULL
@@ -143,7 +143,7 @@
#define EXIM_DBOPEN(name, flags, mode, dbpp) \
if (db_create(dbpp, NULL, 0) != 0 || \
((*dbpp)->set_errcall(*dbpp, dbfn_bdb_error_callback), \
- (*dbpp)->open(*dbpp, CS name, NULL, \
+ ((*dbpp)->open)(*dbpp, CS name, NULL, \
((flags) == O_RDONLY)? DB_UNKNOWN : DB_HASH, \
((flags) == O_RDONLY)? DB_RDONLY : DB_CREATE, \
mode)) != 0) *(dbpp) = NULL
Index: search.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/search.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- search.c 8 Jan 2007 10:50:18 -0000 1.5
+++ search.c 29 Aug 2007 14:02:22 -0000 1.6
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/search.c,v 1.5 2007/01/08 10:50:18 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/search.c,v 1.6 2007/08/29 14:02:22 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -397,7 +397,7 @@
/* If opening is successful, call the file-checking function if there is one,
and if all is still well, enter the open database into the tree. */
-handle = lk->open(filename, &search_error_message);
+handle = (lk->open)(filename, &search_error_message);
if (handle == NULL)
{
store_pool = old_pool;
