aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorPatrik Nyblom <[email protected]>2013-06-05 15:30:22 +0200
committerPatrik Nyblom <[email protected]>2013-06-05 15:30:22 +0200
commiteedd89fcb0b892117b798b8b097cf63b9ab59db7 (patch)
treef9dfcca0ea758fca35f6f94b98c4b013ac255103 /lib
parent620b7e879c9943e1e79990ed0a825228f7b18b04 (diff)
parenteb4d4c133a8c2ad00807888289cb99d67f70896f (diff)
downloadotp-eedd89fcb0b892117b798b8b097cf63b9ab59db7.tar.gz
otp-eedd89fcb0b892117b798b8b097cf63b9ab59db7.tar.bz2
otp-eedd89fcb0b892117b798b8b097cf63b9ab59db7.zip
Merge branch 'pan/r16b01/system_monitor_long_schedule/OTP-11067' into maint
* pan/r16b01/system_monitor_long_schedule/OTP-11067: Minor spelling correction Add system_monitor of long_schedule
Diffstat (limited to 'lib')
-rw-r--r--lib/test_server/doc/src/notes.xml2
-rw-r--r--lib/test_server/src/configure.in1
2 files changed, 1 insertions, 2 deletions
diff --git a/lib/test_server/doc/src/notes.xml b/lib/test_server/doc/src/notes.xml
index b35929f1e6..0eab939a46 100644
--- a/lib/test_server/doc/src/notes.xml
+++ b/lib/test_server/doc/src/notes.xml
@@ -226,8 +226,6 @@
unicode:characters_to_binary for conversion between
binaries and strings instead of binary_to_list and
list_to_binary. </item> </list></p>
- <p>
- Own Id: OTP-10783</p>
</item>
</list>
</section>
diff --git a/lib/test_server/src/configure.in b/lib/test_server/src/configure.in
index 785bab395c..b8fddf1481 100644
--- a/lib/test_server/src/configure.in
+++ b/lib/test_server/src/configure.in
@@ -276,6 +276,7 @@ AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"]))
dnl Checks for library functions.
AC_CHECK_FUNCS(strerror)
AC_CHECK_FUNCS(vsnprintf)
+AC_CHECK_FUNCS(usleep)
# First check if the library is available, then if we can choose between
# two versions of gethostbyname