make HASFLOCK a 0/1 definition so Linux can turn it off

[unix-history] / usr / src / usr.sbin / sendmail / src / map.c

diff --git a/usr/src/usr.sbin/sendmail/src/map.c b/usr/src/usr.sbin/sendmail/src/map.c
index 61926c2..181b40a 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/map.c
+++ b/usr/src/usr.sbin/sendmail/src/map.c
@@ -7,7 +7,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)map.c      8.20 (Berkeley) %G%";
+static char sccsid[] = "@(#)map.c      8.21 (Berkeley) %G%";

 #endif /* not lint */
 
 #include "sendmail.h"
 #endif /* not lint */
 
 #include "sendmail.h"


@@ -612,7 +612,7 @@ bt_map_open(map, mode)
        if (omode == O_RDWR)
        {
                omode |= O_CREAT|O_TRUNC;
        if (omode == O_RDWR)
        {
                omode |= O_CREAT|O_TRUNC;

-#if defined(O_EXLOCK) && defined(HASFLOCK)
+#if defined(O_EXLOCK) && HASFLOCK

                omode |= O_EXLOCK;
 # if !defined(OLD_NEWDB)
        }
                omode |= O_EXLOCK;
 # if !defined(OLD_NEWDB)
        }


@@ -638,7 +638,7 @@ bt_map_open(map, mode)
                        syserr("Cannot open BTREE database %s", map->map_file);
                return FALSE;
        }
                        syserr("Cannot open BTREE database %s", map->map_file);
                return FALSE;
        }

-#if !defined(OLD_NEWDB) && defined(HASFLOCK)
+#if !defined(OLD_NEWDB) && HASFLOCK

        fd = db->fd(db);
 # if !defined(O_EXLOCK)
        if (mode == O_RDWR && fd >= 0)
        fd = db->fd(db);
 # if !defined(O_EXLOCK)
        if (mode == O_RDWR && fd >= 0)


@@ -696,7 +696,7 @@ hash_map_open(map, mode)
        if (omode == O_RDWR)
        {
                omode |= O_CREAT|O_TRUNC;
        if (omode == O_RDWR)
        {
                omode |= O_CREAT|O_TRUNC;

-#if defined(O_EXLOCK) && defined(HASFLOCK)
+#if defined(O_EXLOCK) && HASFLOCK

                omode |= O_EXLOCK;
 # if !defined(OLD_NEWDB)
        }
                omode |= O_EXLOCK;
 # if !defined(OLD_NEWDB)
        }


@@ -722,7 +722,7 @@ hash_map_open(map, mode)
                        syserr("Cannot open HASH database %s", map->map_file);
                return FALSE;
        }
                        syserr("Cannot open HASH database %s", map->map_file);
                return FALSE;
        }

-#if !defined(OLD_NEWDB) && defined(HASFLOCK)
+#if !defined(OLD_NEWDB) && HASFLOCK

        fd = db->fd(db);
 # if !defined(O_EXLOCK)
        if (mode == O_RDWR && fd >= 0)
        fd = db->fd(db);
 # if !defined(O_EXLOCK)
        if (mode == O_RDWR && fd >= 0)