diff options
| author | Patrik Nyblom <[email protected]> | 2013-06-05 15:58:37 +0200 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2013-06-05 15:58:37 +0200 |
| commit | e9b0b2a035f3ca51c9e792a7b3c7c036b72e6816 (patch) | |
| tree | 85311be5c695d5aea5602bb5ba6f8308b3e4b69e /lib/test_server | |
| parent | a7f0387da9aa6cf469a02caf071e20120d3bad87 (diff) | |
| parent | c6fe4731a9093166ff41d16900d22808b5a68053 (diff) | |
| download | otp-e9b0b2a035f3ca51c9e792a7b3c7c036b72e6816.tar.gz otp-e9b0b2a035f3ca51c9e792a7b3c7c036b72e6816.tar.bz2 otp-e9b0b2a035f3ca51c9e792a7b3c7c036b72e6816.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/test_server')
| -rw-r--r-- | lib/test_server/doc/src/notes.xml | 2 | ||||
| -rw-r--r-- | lib/test_server/src/configure.in | 1 |
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 a151bfbda0..77b6faa407 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 |