Merge branch 'smgfs'

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

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

diff --cc libs/freetdm/src/testsangomaboost.c
index b254a08bb814562672d83b3a6758fc4dba505437,01e5a6be22d2141509652c9b62760c8cc9b73f1e..ed2a7bd39d4fb5295b8fd7742a8133f3e7693797
--- 1/libs/freetdm/src/testsangomaboost.c
--- 2/libs/freetdm/src/testsangomaboost.c
+++ b/libs/freetdm/src/testsangomaboost.c
@@@ -51,9 -51,7 +51,8 @@@
  #if defined(__linux__) && !defined(__USE_BSD)
  #define __USE_BSD
  #endif
 +#ifndef WIN32
  #include <unistd.h>
- #endif
  #include "freetdm.h"