s3:brlock: use NUMERIC_CMP in #ifdef-zeroed lock_compare

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15625

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
(cherry picked from commit 9b73235d4957a487fbb3214fdfda6461a2cf0b21)

diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
index 905da049c588d50b8670ac8af649980a845c7f55..328a9bfba3d410eca2786c99f85597987e9d0056 100644 (file)
--- a/source3/locking/brlock.c
+++ b/source3/locking/brlock.c
@@ -408,12 +408,9 @@ static int lock_compare(const struct lock_struct *lck1,
                         const struct lock_struct *lck2)
 {
        if (lck1->start != lck2->start) {
-               return (lck1->start - lck2->start);
+               return NUMERIC_CMP(lck1->start, lck2->start);
        }
-       if (lck2->size != lck1->size) {
-               return ((int)lck1->size - (int)lck2->size);
-       }
-       return 0;
+       return NUMERIC_CMP(lck1->size, lck2->size);
 }
 #endif