about summary refs log tree commit diff
path: root/src/libexpr
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2006-05-11T02·19+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2006-05-11T02·19+0000
commit9d72bf8835f3012169aaa88ec608172d5a056b9e (patch)
tree50aff33e5188dd11ab2ed2bbd188995b2c1db077 /src/libexpr
parente3c07782d124cdd8d0aab2b498225cdca28cad66 (diff)
* 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.

Diffstat (limited to 'src/libexpr')
-rw-r--r--src/libexpr/primops.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index 262e3bec542b..4cd180fd6082 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;