From bfe0583a1264e2b1467942ec33e1fa773d450d9b Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Mon, 10 Aug 2015 11:20:29 +0200
Subject: Move feature test macros to config.h
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I removed most of the *BSD-related stuff, because I can’t test these. If
this breaks your build, send me a patch please.
---
 src/libpiano/config.h   | 1 -
 src/libpiano/piano.c    | 6 +-----
 src/libpiano/piano.h    | 2 ++
 src/libpiano/request.c  | 5 +----
 src/libpiano/response.c | 5 +----
 5 files changed, 5 insertions(+), 14 deletions(-)
 delete mode 100644 src/libpiano/config.h

(limited to 'src/libpiano')

diff --git a/src/libpiano/config.h b/src/libpiano/config.h
deleted file mode 100644
index febad25..0000000
--- a/src/libpiano/config.h
+++ /dev/null
@@ -1 +0,0 @@
-#define PACKAGE "libpiano"
diff --git a/src/libpiano/piano.c b/src/libpiano/piano.c
index b519f49..72502f7 100644
--- a/src/libpiano/piano.c
+++ b/src/libpiano/piano.c
@@ -21,10 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-#ifndef __FreeBSD__
-#define _BSD_SOURCE /* required by strdup() */
-#define _DARWIN_C_SOURCE /* strdup() on OS X */
-#endif
+#include "../config.h"
 
 #include <stdio.h>
 #include <string.h>
@@ -34,7 +31,6 @@ THE SOFTWARE.
 
 #include "piano_private.h"
 #include "piano.h"
-#include "config.h"
 
 /*	initialize piano handle
  *	@param piano handle
diff --git a/src/libpiano/piano.h b/src/libpiano/piano.h
index f0ba4cf..1a84d4a 100644
--- a/src/libpiano/piano.h
+++ b/src/libpiano/piano.h
@@ -24,6 +24,8 @@ THE SOFTWARE.
 #ifndef SRC_LIBPIANO_PIANO_H_MFBT13PN
 #define SRC_LIBPIANO_PIANO_H_MFBT13PN
 
+#include "../config.h"
+
 #include <stdbool.h>
 #ifdef __FreeBSD__
 #define _GCRYPT_IN_LIBGCRYPT
diff --git a/src/libpiano/request.c b/src/libpiano/request.c
index 95ac2d0..02b4b43 100644
--- a/src/libpiano/request.c
+++ b/src/libpiano/request.c
@@ -21,10 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-#ifndef __FreeBSD__
-#define _BSD_SOURCE /* required by strdup() */
-#define _DARWIN_C_SOURCE /* strdup() on OS X */
-#endif
+#include "../config.h"
 
 #include <curl/curl.h>
 #include <json.h>
diff --git a/src/libpiano/response.c b/src/libpiano/response.c
index 542ef00..7f0cee0 100644
--- a/src/libpiano/response.c
+++ b/src/libpiano/response.c
@@ -21,10 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-#ifndef __FreeBSD__
-#define _BSD_SOURCE /* required by strdup() */
-#define _DARWIN_C_SOURCE /* strdup() on OS X */
-#endif
+#include "../config.h"
 
 #include <json.h>
 #include <string.h>
-- 
cgit v1.2.3