Merge with gitk.

[thirdparty/git.git] / diffcore-order.c

diff --git a/diffcore-order.c b/diffcore-order.c
index a03862c1ce73995065bf838b408e8a6d9396025b..b38122361f837e2e2577a89ae7aec311730b7f10 100644 (file)
--- a/diffcore-order.c
+++ b/diffcore-order.c
@@ -28,7 +28,7 @@ static void prepare_order(const char *orderfile)
        }
        map = mmap(NULL, st.st_size, PROT_READ|PROT_WRITE, MAP_PRIVATE, fd, 0);
        close(fd);
-       if (-1 == (int)(long)map)
+       if (map == MAP_FAILED)
                return;
        endp = map + st.st_size;
        for (pass = 0; pass < 2; pass++) {