From 9d72bf8835f3012169aaa88ec608172d5a056b9e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 11 May 2006 02:19:43 +0000 Subject: * 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. --- src/nix-env/main.cc | 2 +- src/nix-env/profiles.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/nix-env') diff --git a/src/nix-env/main.cc b/src/nix-env/main.cc index e7f25c5ba2f1..560612825b31 100644 --- a/src/nix-env/main.cc +++ b/src/nix-env/main.cc @@ -350,7 +350,7 @@ static void queryInstSources(EvalState & state, DrvInfo elem; elem.attrs = shared_ptr(new ATermMap(0)); /* ugh... */ string name = baseNameOf(*i); - unsigned int dash = name.find('-'); + string::size_type dash = name.find('-'); if (dash != string::npos) name = string(name, dash + 1); diff --git a/src/nix-env/profiles.cc b/src/nix-env/profiles.cc index 6db291b3d21c..6ec12e604c73 100644 --- a/src/nix-env/profiles.cc +++ b/src/nix-env/profiles.cc @@ -19,7 +19,7 @@ static int parseName(const string & profileName, const string & name) { if (string(name, 0, profileName.size() + 1) != profileName + "-") return -1; string s = string(name, profileName.size() + 1); - unsigned int p = s.find("-link"); + string::size_type p = s.find("-link"); if (p == string::npos) return -1; int n; if (string2Int(string(s, 0, p), n) && n >= 0) -- cgit 1.4.1