From: David Yat Sin <dyatsin@sangoma.com>
Date: Fri, 10 Dec 2010 20:22:14 +0000 (-0500)
Subject: Merge branch 'smgfs'
X-Git-Tag: v1.2-rc1~234^2~1^2~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb9a1b05accf3fb8a6eb3daa288fa3ffad822dd5;p=thirdparty%2Ffreeswitch.git

Merge branch 'smgfs'
---

fb9a1b05accf3fb8a6eb3daa288fa3ffad822dd5
diff --cc libs/freetdm/src/testsangomaboost.c
index b254a08bb8,01e5a6be22..ed2a7bd39d
--- a/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"