mirror of
https://github.com/Stichting-MINIX-Research-Foundation/pkgsrc-ng.git
synced 2025-08-03 17:59:07 -04:00
32 lines
1.1 KiB
C
32 lines
1.1 KiB
C
$NetBSD: patch-main_utils.c,v 1.2 2015/05/19 07:52:14 jnemeth Exp $
|
|
|
|
--- main/utils.c.orig 2015-03-17 22:28:41.000000000 +0000
|
|
+++ main/utils.c
|
|
@@ -625,7 +625,7 @@ const char *ast_inet_ntoa(struct in_addr
|
|
static int dev_urandom_fd = -1;
|
|
#endif
|
|
|
|
-#ifndef __linux__
|
|
+#if !defined(__linux__) && !defined(__DragonFly__)
|
|
#undef pthread_create /* For ast_pthread_create function only */
|
|
#endif /* !__linux__ */
|
|
|
|
@@ -1642,13 +1642,13 @@ int ast_false(const char *s)
|
|
static struct timeval tvfix(struct timeval a)
|
|
{
|
|
if (a.tv_usec >= ONE_MILLION) {
|
|
- ast_log(LOG_WARNING, "warning too large timestamp %ld.%ld\n",
|
|
- (long)a.tv_sec, (long int) a.tv_usec);
|
|
+ ast_log(LOG_WARNING, "warning too large timestamp %jd.%ld\n",
|
|
+ (intmax_t)a.tv_sec, (long int) a.tv_usec);
|
|
a.tv_sec += a.tv_usec / ONE_MILLION;
|
|
a.tv_usec %= ONE_MILLION;
|
|
} else if (a.tv_usec < 0) {
|
|
- ast_log(LOG_WARNING, "warning negative timestamp %ld.%ld\n",
|
|
- (long)a.tv_sec, (long int) a.tv_usec);
|
|
+ ast_log(LOG_WARNING, "warning negative timestamp %jd.%ld\n",
|
|
+ (intmax_t)a.tv_sec, (long int) a.tv_usec);
|
|
a.tv_usec = 0;
|
|
}
|
|
return a;
|