* 64-bit compatibility fixes (for problems revealed by building on an Athlon

  64 running 64-bit SUSE).  A patched ATerm library is required to run Nix
  succesfully.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index 262e3bec5..4cd180fd6 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -488,9 +488,9 @@ static string relativise(Path pivot, Path p)
     /* Otherwise, `p' is in a parent of `pivot'.  Find up till which
        path component `p' and `pivot' match, and add an appropriate
        number of `..' components. */
-    unsigned int i = 1;
+    string::size_type i = 1;
     while (1) {
-        unsigned int j = pivot.find('/', i);
+        string::size_type j = pivot.find('/', i);
         if (j == string::npos) break;
         j++;
         if (pivot.substr(0, j) != p.substr(0, j)) break;