aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2019-03-16 10:27:56 +0000
committerRon Yorston <rmy@pobox.com>2019-03-16 10:27:56 +0000
commit7f8036d3f0f599a10090c22b73126b7ec6ee3727 (patch)
tree04981c52c50a29c78168f8783dec0d4a8a5375f1 /include
parent9d1ff6a7bd9f598e3d6fe7f9002204044a0c42fa (diff)
parent2bbd1e1e8ababc480ff5d373847ab98ba0cc23dd (diff)
downloadbusybox-w32-7f8036d3f0f599a10090c22b73126b7ec6ee3727.tar.gz
busybox-w32-7f8036d3f0f599a10090c22b73126b7ec6ee3727.tar.bz2
busybox-w32-7f8036d3f0f599a10090c22b73126b7ec6ee3727.zip
Merge branch 'busybox' into merge
Diffstat (limited to 'include')
-rw-r--r--include/libbb.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/libbb.h b/include/libbb.h
index 61574b5ee..b9852345f 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -1079,9 +1079,11 @@ uint16_t xatou16(const char *numstr) FAST_FUNC;
1079#if ENABLE_FLOAT_DURATION 1079#if ENABLE_FLOAT_DURATION
1080typedef double duration_t; 1080typedef double duration_t;
1081void sleep_for_duration(duration_t duration) FAST_FUNC; 1081void sleep_for_duration(duration_t duration) FAST_FUNC;
1082#define DURATION_FMT "f"
1082#else 1083#else
1083typedef unsigned duration_t; 1084typedef unsigned duration_t;
1084#define sleep_for_duration(duration) sleep(duration) 1085#define sleep_for_duration(duration) sleep(duration)
1086#define DURATION_FMT "u"
1085#endif 1087#endif
1086duration_t parse_duration_str(char *str) FAST_FUNC; 1088duration_t parse_duration_str(char *str) FAST_FUNC;
1087 1089