mirror of
https://github.com/signalwire/freeswitch.git
synced 2026-11-16 06:18:35 +00:00
Merge remote branch 'fsorig/master'
Conflicts: libs/freetdm/src/testsangomaboost.c
This commit is contained in:
commit
1ee94f343a
15 files changed
+367
-39
No files matched your search
@@ -48,8 +48,7 @@
|
||||
#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>
|
||||
|
||||
Reference in new issue
Block a user