From: Moises Silva <moy@sangoma.com>
Date: Thu, 9 Dec 2010 03:41:51 +0000 (-0500)
Subject: Merge remote branch 'fsorig/master'
X-Git-Tag: v1.2-rc1~236^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1ee94f343a5ae31e1d484ed51fc5b6dbc5f1e941;p=thirdparty%2Ffreeswitch.git

Merge remote branch 'fsorig/master'

Conflicts:
	libs/freetdm/src/testsangomaboost.c
---

1ee94f343a5ae31e1d484ed51fc5b6dbc5f1e941
diff --cc libs/freetdm/src/testsangomaboost.c
index 84ff287830,61b7c47ddd..e9042eef17
--- a/libs/freetdm/src/testsangomaboost.c
+++ b/libs/freetdm/src/testsangomaboost.c
@@@ -48,10 -48,8 +48,9 @@@
  #include <stdlib.h>
  #include <string.h>
  #include <errno.h>
- #ifdef __linux__
- #ifndef __USE_BSD
+ #if defined(__linux__) && !defined(__USE_BSD)
  #define __USE_BSD
 +#endif
  #include <unistd.h>
  #endif
  #include "freetdm.h"