diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-07-26T19·14-0400 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-07-26T19·14-0400 |
| commit | 8c7910083976e255300efa797030448f5a1cb864 (patch) | |
| tree | afbd7a37d0724feb408a2d025364ed3938b5673a /src/nix-env | |
| parent | aa115e22df1c80e8878237a9e704d7d70783a243 (diff) | |
| parent | 3a4623afbbc1bff85bde33167d36e8c5a4a3df0d (diff) | |
Merge branch 'master' into no-manifests
Diffstat (limited to 'src/nix-env')
| -rw-r--r-- | src/nix-env/profiles.hh | 6 | ||||
| -rw-r--r-- | src/nix-env/user-env.hh | 9 |
2 files changed, 2 insertions, 13 deletions
diff --git a/src/nix-env/profiles.hh b/src/nix-env/profiles.hh index a64258dae224..30d2376d998c 100644 --- a/src/nix-env/profiles.hh +++ b/src/nix-env/profiles.hh @@ -1,5 +1,4 @@ -#ifndef __PROFILES_H -#define __PROFILES_H +#pragma once #include "types.hh" #include "pathlocks.hh" @@ -54,6 +53,3 @@ void lockProfile(PathLocks & lock, const Path & profile); string optimisticLockProfile(const Path & profile); } - - -#endif /* !__PROFILES_H */ diff --git a/src/nix-env/user-env.hh b/src/nix-env/user-env.hh index 4125d821732f..f188efe9b4a9 100644 --- a/src/nix-env/user-env.hh +++ b/src/nix-env/user-env.hh @@ -1,5 +1,4 @@ -#ifndef __USER_ENV_H -#define __USER_ENV_H +#pragma once #include "get-drvs.hh" @@ -12,9 +11,3 @@ bool createUserEnv(EvalState & state, DrvInfos & elems, const string & lockToken); } - -#endif /* !__USER_ENV_H */ - - - - |