diff options
| author | Erwin Lansing <erwin@FreeBSD.org> | 2012-12-17 10:58:24 +0000 |
|---|---|---|
| committer | Erwin Lansing <erwin@FreeBSD.org> | 2012-12-17 10:58:24 +0000 |
| commit | 823eb5f9dd4d336a5cd85e9129ab1da5676191df (patch) | |
| tree | 840dc4ed116d4d74d5bf86e593e1d96d38b4b07f /lib/isc/pthreads | |
| parent | e65fce108837a6a80efa79ff174877e27db324c0 (diff) | |
| download | src-823eb5f9dd4d336a5cd85e9129ab1da5676191df.tar.gz src-823eb5f9dd4d336a5cd85e9129ab1da5676191df.zip | |
Vendor import of Bind 9.6-ESV-R8vendor/bind9/9.6-ESV-R8vendor/bind9-9.6
Approved by: delphij (mentor)
Sponsored by: DK Hostmaster A/S
Notes
Notes:
svn path=/vendor/bind9/dist-9.6/; revision=244353
svn path=/vendor/bind9/9.6-ESV-R8/; revision=244354; tag=vendor/bind9/9.6-ESV-R8
Diffstat (limited to 'lib/isc/pthreads')
| -rw-r--r-- | lib/isc/pthreads/condition.c | 11 | ||||
| -rw-r--r-- | lib/isc/pthreads/include/Makefile.in | 2 | ||||
| -rw-r--r-- | lib/isc/pthreads/include/isc/Makefile.in | 2 |
3 files changed, 11 insertions, 4 deletions
diff --git a/lib/isc/pthreads/condition.c b/lib/isc/pthreads/condition.c index 50281a2b87cb..9053cf0f1dd6 100644 --- a/lib/isc/pthreads/condition.c +++ b/lib/isc/pthreads/condition.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007, 2012 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1998-2001 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -43,7 +43,14 @@ isc_condition_waituntil(isc_condition_t *c, isc_mutex_t *m, isc_time_t *t) { * POSIX defines a timespec's tv_sec as time_t. */ result = isc_time_secondsastimet(t, &ts.tv_sec); - if (result != ISC_R_SUCCESS) + + /* + * If we have a range error ts.tv_sec is most probably a signed + * 32 bit value. Set ts.tv_sec to INT_MAX. This is a kludge. + */ + if (result == ISC_R_RANGE) + ts.tv_sec = INT_MAX; + else if (result != ISC_R_SUCCESS) return (result); /*! diff --git a/lib/isc/pthreads/include/Makefile.in b/lib/isc/pthreads/include/Makefile.in index 0303ab1302b9..46c243e1abcb 100644 --- a/lib/isc/pthreads/include/Makefile.in +++ b/lib/isc/pthreads/include/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2007, 2012 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 1998-2001 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any diff --git a/lib/isc/pthreads/include/isc/Makefile.in b/lib/isc/pthreads/include/isc/Makefile.in index 11675ec21faa..7cadcf4b6f3d 100644 --- a/lib/isc/pthreads/include/isc/Makefile.in +++ b/lib/isc/pthreads/include/isc/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2007, 2012 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 1998-2001 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any |