From: John Ellson <ellson@research.att.com>
Date: Tue, 12 Jan 2016 14:21:31 +0000 (-0500)
Subject: fix redefintion of qsort_cmpf on RHEL5
X-Git-Tag: TRAVIS_CI_BUILD_EXPERIMENTAL~55
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8c6e35ede8ee74ff8fb24a351f34f7119b70e894;p=graphviz

fix redefintion of qsort_cmpf on RHEL5
---

diff --git a/lib/common/postproc.c b/lib/common/postproc.c
index 9313d4b1d..7f2d34977 100644
--- a/lib/common/postproc.c
+++ b/lib/common/postproc.c
@@ -423,7 +423,8 @@ static int cmp_obj(xlabel_state* state, object_t* obj0, object_t* obj1)
 // EL5 has glibc 2.5 and no qsort_r
 static xlabel_state *XLABS;  // global
 
-typedef int (*qsort_cmpf) (const void *, const void *);
+//Already defined in types.h
+//typedef int (*qsort_cmpf) (const void *, const void *);
 
 static int cmp_obj(object_t* obj0, object_t* obj1)
 {
diff --git a/lib/common/types.h.in b/lib/common/types.h.in
index 9463c1624..cc75cd62b 100644
--- a/lib/common/types.h.in
+++ b/lib/common/types.h.in
@@ -42,6 +42,7 @@ typedef unsigned char boolean;
 extern "C" {
 #endif
 
+    typedef int (*qsort_cmpf) (const void *, const void *);
     typedef int (*bsearch_cmpf) (const void *, const void *);
     typedef struct Agraph_s graph_t;
     typedef struct Agnode_s node_t;