Merge branch 'master' into netborder

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

diff --cc libs/freetdm/src/ftdm_io.c
Simple merge

diff --cc libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.c
Simple merge

diff --cc libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_support.c
index 860e17b0fb2eb31d3a663590309c99954343e65a,76d11d6d345eaebcc42cc06cee0887d592cfa240..06e132f9fa62bfc701645ab2f5b75803e601092c
--- 1/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_support.c
--- 2/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 84ff28783075a3936227be68022e66dfe476ec8d,01e5a6be22d2141509652c9b62760c8cc9b73f1e..7174d1e7f7d5998843076ab8abea6ec28f4ffb2e
--- 1/libs/freetdm/src/testsangomaboost.c
--- 2/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"