diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2020-10-06 13:36:55 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2020-10-06 13:49:20 +0200 |
| commit | 85c8be6286e8f5464813a8a29b0b78d892498745 (patch) | |
| tree | e270b31fa13afd6e87e610f41fcffe039d4381bd /src/libstore/globals.cc | |
| parent | 0419cd26954d9d7c5b5ace96501b41cc81d66eed (diff) | |
Remove static variable name clashes
This was useful for an experiment with building Nix as a single
compilation unit. It's not very useful otherwise but also doesn't
hurt...
Diffstat (limited to 'src/libstore/globals.cc')
| -rw-r--r-- | src/libstore/globals.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc index c5734852d..1238dc530 100644 --- a/src/libstore/globals.cc +++ b/src/libstore/globals.cc @@ -25,7 +25,7 @@ namespace nix { Settings settings; -static GlobalConfig::Register r1(&settings); +static GlobalConfig::Register rSettings(&settings); Settings::Settings() : nixPrefix(NIX_PREFIX) |