diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2006-05-11 02:19:43 +0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2006-05-11 02:19:43 +0000 |
| commit | 9d72bf8835f3012169aaa88ec608172d5a056b9e (patch) | |
| tree | 50aff33e5188dd11ab2ed2bbd188995b2c1db077 /src/nix-env | |
| parent | e3c07782d124cdd8d0aab2b498225cdca28cad66 (diff) | |
| download | guix-9d72bf8835f3012169aaa88ec608172d5a056b9e.tar.gz | |
* 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/nix-env')
| -rw-r--r-- | src/nix-env/main.cc | 2 | ||||
| -rw-r--r-- | src/nix-env/profiles.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/nix-env/main.cc b/src/nix-env/main.cc index e7f25c5ba2..560612825b 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<ATermMap>(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 6db291b3d2..6ec12e604c 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) |