mirror of
https://github.com/NixOS/nix
synced 2025-06-25 06:31:14 +02:00
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...
This commit is contained in:
parent
0419cd2695
commit
85c8be6286
63 changed files with 97 additions and 92 deletions
|
@ -1330,7 +1330,7 @@ static void opVersion(Globals & globals, Strings opFlags, Strings opArgs)
|
|||
}
|
||||
|
||||
|
||||
static int _main(int argc, char * * argv)
|
||||
static int main_nix_env(int argc, char * * argv)
|
||||
{
|
||||
{
|
||||
Strings opFlags, opArgs;
|
||||
|
@ -1460,4 +1460,4 @@ static int _main(int argc, char * * argv)
|
|||
}
|
||||
}
|
||||
|
||||
static RegisterLegacyCommand s1("nix-env", _main);
|
||||
static RegisterLegacyCommand r_nix_env("nix-env", main_nix_env);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue