From: Tobias Brunner <tobias@strongswan.org>
Date: Thu, 13 Feb 2014 09:41:22 +0000 (+0100)
Subject: array: Fix compilation on FreeBSD
X-Git-Tag: 5.1.2rc1~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=593251fcf6353d37fd21a73f54877ec512ae0cd1;p=thirdparty%2Fstrongswan.git

array: Fix compilation on FreeBSD
---

diff --git a/src/libstrongswan/collections/array.c b/src/libstrongswan/collections/array.c
index 642bbb349a..314e8e9165 100644
--- a/src/libstrongswan/collections/array.c
+++ b/src/libstrongswan/collections/array.c
@@ -391,7 +391,7 @@ typedef struct {
 
 #ifdef HAVE_QSORT_R_GNU
 static int compare_elements(const void *a, const void *b, void *arg)
-#elif  HAVE_QSORT_R_BSD
+#elif defined(HAVE_QSORT_R_BSD)
 static int compare_elements(void *arg, const void *a, const void *b)
 #else /* !HAVE_QSORT_R */
 static int compare_elements(const void *a, const void *b)
@@ -427,7 +427,7 @@ void array_sort(array_t *array, int (*cmp)(const void*,const void*,void*),
 #ifdef HAVE_QSORT_R_GNU
 		qsort_r(start, array->count, get_size(array, 1), compare_elements,
 				&data);
-#elif  HAVE_QSORT_R_BSD
+#elif defined(HAVE_QSORT_R_BSD)
 		qsort_r(start, array->count, get_size(array, 1), &data,
 				compare_elements);
 #else /* !HAVE_QSORT_R */