From: Moises Silva <moises.silva@gmail.com>
Date: Fri, 10 Dec 2010 13:48:43 +0000 (-0500)
Subject: Merge branch 'master' into netborder
X-Git-Tag: v1.2-rc1~236
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9dc863e21635111f6fdcc8c2d0c4fd6ab2f8e14;p=thirdparty%2Ffreeswitch.git

Merge branch 'master' into netborder

Conflicts:
	libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_support.c
	libs/freetdm/src/testsangomaboost.c
---

e9dc863e21635111f6fdcc8c2d0c4fd6ab2f8e14
diff --cc libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_support.c
index 860e17b0fb,76d11d6d34..06e132f9fa
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_support.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_support.c
@@@ -692,7 -692,7 +692,6 @@@ ftdm_status_t set_facility_ie_str(ftdm_
  {
  	int len;
  	ftdm_caller_data_t *caller_data = &ftdmchan->caller_data;
- 	
 -
  	if (caller_data->raw_data_len > 0 && caller_data->raw_data[0] == SNGISDN_Q931_FACILITY_IE_ID) {
  		len = caller_data->raw_data[1];
  		memcpy(data, &caller_data->raw_data[2], len);
diff --cc libs/freetdm/src/testsangomaboost.c
index 84ff287830,01e5a6be22..7174d1e7f7
--- a/libs/freetdm/src/testsangomaboost.c
+++ b/libs/freetdm/src/testsangomaboost.c
@@@ -48,12 -48,10 +48,15 @@@
  #include <stdlib.h>
  #include <string.h>
  #include <errno.h>
- #ifdef __linux__
- #ifndef __USE_BSD
++
+ #if defined(__linux__) && !defined(__USE_BSD)
  #define __USE_BSD
  #endif
++
++#ifndef WIN32
  #include <unistd.h>
 +#endif
++
  #include "freetdm.h"