|
Lines 1-27
Link Here
|
| 1 |
--- lib/libiax2/src/iax.c.orig Thu May 25 18:42:18 2006 |
|
|
| 2 |
+++ lib/libiax2/src/iax.c Thu May 25 18:44:26 2006 |
| 3 |
@@ -59,14 +59,12 @@ void gettimeofday(struct timeval *tv, vo |
| 4 |
#include <arpa/inet.h> |
| 5 |
#include <time.h> |
| 6 |
|
| 7 |
-#ifndef MACOSX |
| 8 |
+#if !defined(MACOSX) && !defined(__FreeBSD__) |
| 9 |
#include <malloc.h> |
| 10 |
#ifndef SOLARIS |
| 11 |
-#if !defined(__NetBSD__) && !defined(__FreeBSD__) |
| 12 |
#include <error.h> |
| 13 |
#endif |
| 14 |
#endif |
| 15 |
-#endif |
| 16 |
|
| 17 |
#endif |
| 18 |
|
| 19 |
@@ -97,7 +95,7 @@ void gettimeofday(struct timeval *tv, vo |
| 20 |
#ifdef SOLARIS |
| 21 |
#define IAX_SOCKOPTS MSG_DONTWAIT |
| 22 |
#else |
| 23 |
-#ifdef __NetBSD__ |
| 24 |
+#if defined(__NetBSD__) || defined(__FreeBSD__) |
| 25 |
#define IAX_SOCKOPTS MSG_DONTWAIT |
| 26 |
#else /* Linux and others */ |
| 27 |
#define IAX_SOCKOPTS MSG_DONTWAIT | MSG_NOSIGNAL |