Merge remote branch 'fsorig/master'

Conflicts:
	libs/freetdm/src/testsangomaboost.c

diff --cc libs/freetdm/src/testsangomaboost.c
index 84ff28783075a3936227be68022e66dfe476ec8d,61b7c47ddd04aad3de62e761b8a0a1d340024fed..e9042eef1757a17d8a7596e6cbf051ef3850fd04
--- 1/libs/freetdm/src/testsangomaboost.c
--- 2/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"