diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2010-11-27 15:38:46 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2010-11-27 15:38:46 +0100 |
| commit | 3e345f79812efc6074682473203b25c420d6b962 (patch) | |
| tree | 0f0ebd84e5e8e360266e40156fc45e2d85ed2417 | |
| parent | 3e10337253f0ee309483fd11f593654a4e995ddd (diff) | |
| download | gnutls-3e345f79812efc6074682473203b25c420d6b962.tar.gz | |
Use rusage if present.
Moved check to correct config and included resource.h header.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | lib/configure.ac | 1 | ||||
| -rw-r--r-- | lib/nettle/rnd.c | 3 |
3 files changed, 5 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 9b8d1e8cf4..fdce646bcf 100644 --- a/configure.ac +++ b/configure.ac @@ -75,7 +75,7 @@ AC_DEFINE([HAVE_CTYPE_H], 1, [Hard-code for src/cfg/.]) AC_DEFINE([HAVE_ERRNO_H], 1, [Hard-code for src/cfg/.]) # No fork on MinGW, disable some self-tests until we fix them. -AC_CHECK_FUNCS(fork getrusage,,) +AC_CHECK_FUNCS(fork,,) AM_CONDITIONAL(HAVE_FORK, test "$ac_cv_func_fork" != "no") AC_CHECK_TYPES(uint,,, [ diff --git a/lib/configure.ac b/lib/configure.ac index 0d30e8adef..3a89288bda 100644 --- a/lib/configure.ac +++ b/lib/configure.ac @@ -82,6 +82,7 @@ fi lgl_INIT +AC_CHECK_FUNCS(getrusage,,) AC_LIB_HAVE_LINKFLAGS(pthread,, [#include <pthread.h>], [pthread_mutex_lock (0);]) LIBGNUTLS_LIBS="-L${libdir} -lgnutls $LIBS" diff --git a/lib/nettle/rnd.c b/lib/nettle/rnd.c index 04d3b32a11..6f6aa8ef84 100644 --- a/lib/nettle/rnd.c +++ b/lib/nettle/rnd.c @@ -155,6 +155,9 @@ wrap_nettle_rnd_deinit (void *ctx) #include <sys/time.h> #include <fcntl.h> #include <locks.h> +#ifdef HAVE_GETRUSAGE +# include <sys/resource.h> +#endif #include "egd.h" #define DEVICE_READ_SIZE 16 |