Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@subversion.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1413086 - in /subversion/trunk: aclocal.m4
 build/ac-macros/qsort_r.m4 configure.ac subversion/svn_private_config.hw
Date: Fri, 23 Nov 2012 22:00:29 -0000
To: commits@subversion.apache.org
From: brane@apache.org
Message-Id: <20121123220030.7CD502388ABB@eris.apache.org>

Author: brane
Date: Fri Nov 23 22:00:28 2012
New Revision: 1413086

URL: http://svn.apache.org/viewvc?rev=1413086&view=rev
Log:
Kill off configury for qsort_r. The hassle of trying to use the fifteen different
implementations is bigger than the benefit.

* aclocal.m4: Do not include build/ac-macros/qsort_r.m4.
* configure.ac: Remove qsort buts from AH_BOTTOM and don't call SVN_FUNC_QSORT_R.
* build/ac-macros/qsort_r.m4: Delete.
* subversion/svn_private_config.hw (HAVE_QSORT_R, SVN_QSORT_R): Remove.

Removed:
    subversion/trunk/build/ac-macros/qsort_r.m4
Modified:
    subversion/trunk/aclocal.m4
    subversion/trunk/configure.ac
    subversion/trunk/subversion/svn_private_config.hw

Modified: subversion/trunk/aclocal.m4
URL: http://svn.apache.org/viewvc/subversion/trunk/aclocal.m4?rev=1413086&r1=1413085&r2=1413086&view=diff
==============================================================================
--- subversion/trunk/aclocal.m4 (original)
+++ subversion/trunk/aclocal.m4 Fri Nov 23 22:00:28 2012
@@ -47,7 +47,6 @@ sinclude(build/ac-macros/swig.m4)
 sinclude(build/ac-macros/zlib.m4)
 sinclude(build/ac-macros/kwallet.m4)
 sinclude(build/ac-macros/macosx.m4)
-sinclude(build/ac-macros/qsort_r.m4)
 
 # Include the libtool macros
 sinclude(build/libtool.m4)

Modified: subversion/trunk/configure.ac
URL: http://svn.apache.org/viewvc/subversion/trunk/configure.ac?rev=1413086&r1=1413085&r2=1413086&view=diff
==============================================================================
--- subversion/trunk/configure.ac (original)
+++ subversion/trunk/configure.ac Fri Nov 23 22:00:28 2012
@@ -683,18 +683,6 @@ if test "$enable_nls" = "yes"; then
 fi
 
 AH_BOTTOM([
-/* Wrap qsort_r for cross-platform compatibility */
-#ifndef HAVE_QSORT_R
-#define SVN_QSORT_R(base, length, width, compare, thunk) \
-  (qsort((base), (length), (width), (compare)))
-#elif defined(SVN_QSORT_R_NORMAL_ARG_ORDER)
-#define SVN_QSORT_R qsort_r
-#else
-/* BSD changes the order of the compare and thunk arguments */
-#define SVN_QSORT_R(base, length, width, compare, thunk) \
-  (qsort_r((base), (length), (width), (thunk), (compare)))
-#endif
-
 /* Indicate to translators that string X should be translated.  Do not look
    up the translation at run time; just expand to X.  This macro is suitable
    for use where a constant string is required at compile time. */
@@ -882,9 +870,6 @@ AC_FUNC_VPRINTF
 dnl check for functions needed in special file handling
 AC_CHECK_FUNCS(symlink readlink)
 
-dnl check for qsor_r presence and argument ordering
-SVN_FUNC_QSORT_R
-
 dnl check for uname
 AC_CHECK_HEADERS(sys/utsname.h, [AC_CHECK_FUNCS(uname)], [])
 

Modified: subversion/trunk/subversion/svn_private_config.hw
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn_private_config.hw?rev=1413086&r1=1413085&r2=1413086&view=diff
==============================================================================
--- subversion/trunk/subversion/svn_private_config.hw (original)
+++ subversion/trunk/subversion/svn_private_config.hw Fri Nov 23 22:00:28 2012
@@ -82,9 +82,6 @@
 #define SVN_APR_INT64_T_PYCFMT "L"
 #endif
 
-#define HAVE_QSORT_R 1
-#define SVN_QSORT_R qsort_s
-
 /* Setup gettext macros */
 #define N_(x) x
 #define U_(x) x