diff options
Diffstat (limited to 'nix')
| -rw-r--r-- | nix/libstore/globals.hh | 2 | ||||
| -rw-r--r-- | nix/libstore/store-api.hh | 2 | ||||
| -rw-r--r-- | nix/libutil/util.hh | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/nix/libstore/globals.hh b/nix/libstore/globals.hh index c2824789ede..d68993f280f 100644 --- a/nix/libstore/globals.hh +++ b/nix/libstore/globals.hh | |||
| @@ -103,7 +103,7 @@ struct Settings { | |||
| 103 | /* The canonical system name, as returned by config.guess. */ | 103 | /* The canonical system name, as returned by config.guess. */ |
| 104 | string thisSystem; | 104 | string thisSystem; |
| 105 | 105 | ||
| 106 | /* The maximum time in seconds that a builer can go without | 106 | /* The maximum time in seconds that a builder can go without |
| 107 | producing any output on stdout/stderr before it is killed. 0 | 107 | producing any output on stdout/stderr before it is killed. 0 |
| 108 | means infinity. */ | 108 | means infinity. */ |
| 109 | time_t maxSilentTime; | 109 | time_t maxSilentTime; |
diff --git a/nix/libstore/store-api.hh b/nix/libstore/store-api.hh index affa98b179d..b57f1e10842 100644 --- a/nix/libstore/store-api.hh +++ b/nix/libstore/store-api.hh | |||
| @@ -357,7 +357,7 @@ Path addPermRoot(StoreAPI & store, const Path & storePath, | |||
| 357 | 357 | ||
| 358 | 358 | ||
| 359 | /* Sort a set of paths topologically under the references relation. | 359 | /* Sort a set of paths topologically under the references relation. |
| 360 | If p refers to q, then p preceeds q in this list. */ | 360 | If p refers to q, then p precedes q in this list. */ |
| 361 | Paths topoSortPaths(StoreAPI & store, const PathSet & paths); | 361 | Paths topoSortPaths(StoreAPI & store, const PathSet & paths); |
| 362 | 362 | ||
| 363 | 363 | ||
diff --git a/nix/libutil/util.hh b/nix/libutil/util.hh index 42cb60ea0d4..3bf2f0be754 100644 --- a/nix/libutil/util.hh +++ b/nix/libutil/util.hh | |||
| @@ -170,7 +170,7 @@ void writeToStderr(const string & s); | |||
| 170 | inline void (*_writeToStderr) (const unsigned char * buf, size_t count) = 0; | 170 | inline void (*_writeToStderr) (const unsigned char * buf, size_t count) = 0; |
| 171 | 171 | ||
| 172 | 172 | ||
| 173 | /* Wrappers arount read()/write() that read/write exactly the | 173 | /* Wrappers around read()/write() that read/write exactly the |
| 174 | requested number of bytes. */ | 174 | requested number of bytes. */ |
| 175 | void readFull(int fd, unsigned char * buf, size_t count); | 175 | void readFull(int fd, unsigned char * buf, size_t count); |
| 176 | void writeFull(int fd, const unsigned char * buf, size_t count); | 176 | void writeFull(int fd, const unsigned char * buf, size_t count); |
