diff options
| author | joerg <joerg@pkgsrc.org> | 2007-08-05 18:37:01 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2007-08-05 18:37:01 +0000 |
| commit | 70cccabbd688b49cab0498df169bed8a01fa5261 (patch) | |
| tree | a62b098d7d0795528d0fb4caad074bd73ea9aacf /net/kiax/patches/patch-ae | |
| parent | 9541a7776461b0a73a8e0ff9e8f94fbb82818e4a (diff) | |
| download | pkgsrc-70cccabbd688b49cab0498df169bed8a01fa5261.tar.gz | |
Don't use malloc.h.
Diffstat (limited to 'net/kiax/patches/patch-ae')
| -rw-r--r-- | net/kiax/patches/patch-ae | 39 |
1 files changed, 27 insertions, 12 deletions
diff --git a/net/kiax/patches/patch-ae b/net/kiax/patches/patch-ae index f1b3f41b98a..f4dbaa0e61f 100644 --- a/net/kiax/patches/patch-ae +++ b/net/kiax/patches/patch-ae @@ -1,8 +1,16 @@ -$NetBSD: patch-ae,v 1.4 2006/07/07 16:50:35 reinoud Exp $ +$NetBSD: patch-ae,v 1.5 2007/08/05 18:37:01 joerg Exp $ ---- lib/libiax2/src/iax.c.orig 2006-06-08 00:03:53.000000000 +0200 +--- lib/libiax2/src/iax.c.orig 2006-06-07 22:03:53.000000000 +0000 +++ lib/libiax2/src/iax.c -@@ -38,6 +38,7 @@ void gettimeofday(struct timeval *tv, vo +@@ -18,7 +18,6 @@ + #include <winsock.h> + #include <time.h> + #include <stdlib.h> +-#include <malloc.h> + #include <stdarg.h> + #include <stdio.h> + #include <fcntl.h> +@@ -38,6 +37,7 @@ void gettimeofday(struct timeval *tv, vo #else @@ -10,16 +18,23 @@ $NetBSD: patch-ae,v 1.4 2006/07/07 16:50:35 reinoud Exp $ #include <netdb.h> #include <sys/socket.h> #include <netinet/in.h> -@@ -62,7 +63,7 @@ void gettimeofday(struct timeval *tv, vo - #if !defined(MACOSX) && !defined(__FreeBSD__) - #include <malloc.h> - #ifndef SOLARIS +@@ -59,15 +59,6 @@ void gettimeofday(struct timeval *tv, vo + #include <arpa/inet.h> + #include <time.h> + +-#if !defined(MACOSX) && !defined(__FreeBSD__) +-#include <malloc.h> +-#ifndef SOLARIS -#if !defined(__NetBSD__) && !defined(__FreeBSD__) -+#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) - #include <error.h> - #endif - #endif -@@ -97,7 +98,7 @@ void gettimeofday(struct timeval *tv, vo +-#include <error.h> +-#endif +-#endif +-#endif +- + #endif + + #ifdef NEWJB +@@ -97,7 +88,7 @@ void gettimeofday(struct timeval *tv, vo #ifdef SOLARIS #define IAX_SOCKOPTS MSG_DONTWAIT #else |