From 0cf770a8367e793d67cd7607cd66886d1d65fbcd Mon Sep 17 00:00:00 2001
From: Michael Jerris <mike@jerris.com>
Date: Mon, 17 Nov 2014 09:27:22 -0500
Subject: [PATCH] FS-6996: #resolve fix define change as of glibc 2.20 for
 _BSD_SOURCE -> _DEFAULT_SOURCE

---
 libs/freetdm/src/ftdm_backtrace.c                    | 3 +++
 libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c           | 3 +++
 libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c | 3 +++
 libs/libnatpmp/natpmp.c                              | 3 +++
 libs/xmlrpc-c/lib/abyss/src/conf.c                   | 3 +++
 libs/xmlrpc-c/lib/abyss/src/http.c                   | 3 +++
 libs/xmlrpc-c/lib/abyss/src/server.c                 | 3 +++
 src/include/switch.h                                 | 3 +++
 8 files changed, 24 insertions(+)

diff --git a/libs/freetdm/src/ftdm_backtrace.c b/libs/freetdm/src/ftdm_backtrace.c
index b27c8ebbe8..8f6756d939 100644
--- a/libs/freetdm/src/ftdm_backtrace.c
+++ b/libs/freetdm/src/ftdm_backtrace.c
@@ -2,6 +2,9 @@
  *
  *
  */
+#ifndef _DEFAULT_SOURCE
+#define _DEFAULT_SOURCE
+#endif
 #define _BSD_SOURCE
 #include "private/ftdm_core.h"
 
diff --git a/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c b/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c
index 026b7b17df..2dea680987 100755
--- a/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c
+++ b/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c
@@ -38,6 +38,9 @@
  */
 
 #ifdef __linux__
+#ifndef _DEFAULT_SOURCE
+#define _DEFAULT_SOURCE
+#endif
 #ifndef _BSD_SOURCE
 #define _BSD_SOURCE /* for strsep() */
 #endif
diff --git a/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c b/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c
index ca60e30352..0e8b73e9c0 100755
--- a/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c
+++ b/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c
@@ -40,6 +40,9 @@
  *
  */ 
 #ifdef WP_DEBUG_IO
+#ifndef _DEFAULT_SOURCE
+#define _DEFAULT_SOURCE
+#endif
 #define _BSD_SOURCE
 #include <syscall.h>
 #endif
diff --git a/libs/libnatpmp/natpmp.c b/libs/libnatpmp/natpmp.c
index c79e92bdfd..d2ff9d5fd3 100644
--- a/libs/libnatpmp/natpmp.c
+++ b/libs/libnatpmp/natpmp.c
@@ -15,6 +15,9 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
 #ifdef __linux__
+#ifndef _DEFAULT_SOURCE
+#define _DEFAULT_SOURCE
+#endif
 #define _BSD_SOURCE 1
 #endif
 #include <string.h>
diff --git a/libs/xmlrpc-c/lib/abyss/src/conf.c b/libs/xmlrpc-c/lib/abyss/src/conf.c
index e0feff9f6b..891aa96c1c 100644
--- a/libs/xmlrpc-c/lib/abyss/src/conf.c
+++ b/libs/xmlrpc-c/lib/abyss/src/conf.c
@@ -34,6 +34,9 @@
 
 #define _XOPEN_SOURCE 600   /* For strdup() */
 #define _BSD_SOURCE  /* For xmlrpc_strcaseeq */
+#ifndef _DEFAULT_SOURCE
+#define _DEFAULT_SOURCE
+#endif
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/libs/xmlrpc-c/lib/abyss/src/http.c b/libs/xmlrpc-c/lib/abyss/src/http.c
index 4f9ef10118..c4269e21cd 100644
--- a/libs/xmlrpc-c/lib/abyss/src/http.c
+++ b/libs/xmlrpc-c/lib/abyss/src/http.c
@@ -2,6 +2,9 @@
 
 #define _XOPEN_SOURCE 600   /* For strdup() */
 #define _BSD_SOURCE   /* For xmlrpc_strcaseeq() */
+#ifndef _DEFAULT_SOURCE
+#define _DEFAULT_SOURCE
+#endif
 
 #include <ctype.h>
 #include <assert.h>
diff --git a/libs/xmlrpc-c/lib/abyss/src/server.c b/libs/xmlrpc-c/lib/abyss/src/server.c
index 392f36813a..6337dcfd78 100644
--- a/libs/xmlrpc-c/lib/abyss/src/server.c
+++ b/libs/xmlrpc-c/lib/abyss/src/server.c
@@ -2,6 +2,9 @@
 
 #define _XOPEN_SOURCE 600  /* Make sure strdup() is in <string.h> */
 #define _BSD_SOURCE  /* Make sure setgroups()is in <grp.h> */
+#ifndef _DEFAULT_SOURCE
+#define _DEFAULT_SOURCE
+#endif
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/src/include/switch.h b/src/include/switch.h
index 2fda7e7ade..ca95045248 100644
--- a/src/include/switch.h
+++ b/src/include/switch.h
@@ -63,6 +63,9 @@
 #ifndef _BSD_SOURCE
 #define _BSD_SOURCE
 #endif
+#ifndef _DEFAULT_SOURCE
+#define _DEFAULT_SOURCE
+#endif
 #endif
 #ifndef __BSD_VISIBLE
 #define __BSD_VISIBLE 1