1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128
|
From: Chow Loong Jin <hyperair@debian.org>
Date: Mon, 7 Dec 2015 14:25:03 +0800
Subject: Set _DEFAULT_SOURCE as well wherever _BSD_SOURCE is defined
_BSD_SOURCE has been deprecated in glibc2.20, so define both of these for
backward compatibility.
Bug-Debian: https://bugs.debian.org/807056
---
src/PacketBuffer.cc | 1 +
src/Sniffer.cc | 1 +
src/Sniffer.h | 1 +
src/SortedIterator.cc | 1 +
src/TCContainer.cc | 1 +
src/TCContainer.h | 1 +
src/TCPConnection.cc | 1 +
src/TextUI.h | 1 +
src/main.cc | 1 +
9 files changed, 9 insertions(+)
diff --git a/src/PacketBuffer.cc b/src/PacketBuffer.cc
index 2bf3017..315aea8 100644
--- a/src/PacketBuffer.cc
+++ b/src/PacketBuffer.cc
@@ -20,6 +20,7 @@
*
*/
#define _BSD_SOURCE 1
+#define _DEFAULT_SOURCE 1
#define _REENTRANT
#include <queue>
#include <time.h>
diff --git a/src/Sniffer.cc b/src/Sniffer.cc
index d7989c4..d733cc6 100644
--- a/src/Sniffer.cc
+++ b/src/Sniffer.cc
@@ -21,6 +21,7 @@
*/
#include "../config.h"
#define _BSD_SOURCE 1
+#define _DEFAULT_SOURCE 1
#define _REENTRANT
#include <pthread.h>
#include <cassert>
diff --git a/src/Sniffer.h b/src/Sniffer.h
index dda971d..4898810 100644
--- a/src/Sniffer.h
+++ b/src/Sniffer.h
@@ -23,6 +23,7 @@
#define SNIFFER_H 1
#define _BSD_SOURCE 1
+#define _DEFAULT_SOURCE 1
#define _REENTRANT
#ifdef HAVE_PCAP_PCAP_H
diff --git a/src/SortedIterator.cc b/src/SortedIterator.cc
index a069dc0..7299c8d 100644
--- a/src/SortedIterator.cc
+++ b/src/SortedIterator.cc
@@ -20,6 +20,7 @@
*
*/
#define _BSD_SOURCE 1
+#define _DEFAULT_SOURCE 1
#define _REENTRANT
#include <stdlib.h>
#include <list>
diff --git a/src/TCContainer.cc b/src/TCContainer.cc
index 726011e..379e49f 100644
--- a/src/TCContainer.cc
+++ b/src/TCContainer.cc
@@ -20,6 +20,7 @@
*
*/
#define _BSD_SOURCE 1
+#define _DEFAULT_SOURCE 1
#define _REENTRANT
#include <unistd.h>
#include <stdio.h>
diff --git a/src/TCContainer.h b/src/TCContainer.h
index a3e2387..119e81f 100644
--- a/src/TCContainer.h
+++ b/src/TCContainer.h
@@ -23,6 +23,7 @@
#define TCCONTAINER_H 1
#define _BSD_SOURCE 1
+#define _DEFAULT_SOURCE 1
#define _REENTRANT
#include <sys/types.h>
#include <pthread.h>
diff --git a/src/TCPConnection.cc b/src/TCPConnection.cc
index 2d6e785..8086416 100644
--- a/src/TCPConnection.cc
+++ b/src/TCPConnection.cc
@@ -20,6 +20,7 @@
*
*/
#define _BSD_SOURCE 1
+#define _DEFAULT_SOURCE 1
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/src/TextUI.h b/src/TextUI.h
index e9f71fd..6741031 100644
--- a/src/TextUI.h
+++ b/src/TextUI.h
@@ -23,6 +23,7 @@
#define TEXTUI_H 1
#define _BSD_SOURCE 1
+#define _DEFAULT_SOURCE 1
#define _REENTRANT
#include <curses.h>
#include <pthread.h>
diff --git a/src/main.cc b/src/main.cc
index e14fa32..d73d405 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -20,6 +20,7 @@
*
*/
#define _BSD_SOURCE 1
+#define _DEFAULT_SOURCE 1
#define _REENTRANT
#include "../config.h" // for PACKAGE and VERSION
#include <stdio.h>
|