diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-01-04 19:54:36 +0700 |
|---|---|---|
| committer | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-01-04 19:54:36 +0700 |
| commit | 47a20f7daf954c90bbc77d2c108cb366171c650f (patch) | |
| tree | 06ed9ed8cb4f7cea8dfa75de197f54b9bc18ca67 /include | |
| parent | 8cef222175855ae08f3768a5586b00650240403d (diff) | |
| parent | 6722737ece4b8db3e30b53aef8f981f53db1621e (diff) | |
| download | busybox-w32-47a20f7daf954c90bbc77d2c108cb366171c650f.tar.gz busybox-w32-47a20f7daf954c90bbc77d2c108cb366171c650f.tar.bz2 busybox-w32-47a20f7daf954c90bbc77d2c108cb366171c650f.zip | |
Merge commit '6722737ece4b8db3e30b53aef8f981f53db1621e'
Conflicts:
coreutils/dos2unix.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/libbb.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/libbb.h b/include/libbb.h index 99bfe085c..325aae2a3 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
| @@ -436,6 +436,7 @@ int xopen_stdin(const char *pathname) FAST_FUNC; | |||
| 436 | void xrename(const char *oldpath, const char *newpath) FAST_FUNC; | 436 | void xrename(const char *oldpath, const char *newpath) FAST_FUNC; |
| 437 | int rename_or_warn(const char *oldpath, const char *newpath) FAST_FUNC; | 437 | int rename_or_warn(const char *oldpath, const char *newpath) FAST_FUNC; |
| 438 | off_t xlseek(int fd, off_t offset, int whence) FAST_FUNC; | 438 | off_t xlseek(int fd, off_t offset, int whence) FAST_FUNC; |
| 439 | int xmkstemp(char *template) FAST_FUNC; | ||
| 439 | off_t fdlength(int fd) FAST_FUNC; | 440 | off_t fdlength(int fd) FAST_FUNC; |
| 440 | 441 | ||
| 441 | uoff_t FAST_FUNC get_volume_size_in_bytes(int fd, | 442 | uoff_t FAST_FUNC get_volume_size_in_bytes(int fd, |