You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@apr.apache.org by yl...@apache.org on 2019/03/22 23:11:04 UTC

svn commit: r1856089 - /apr/apr/trunk/build/apr_common.m4

Author: ylavic
Date: Fri Mar 22 23:11:04 2019
New Revision: 1856089

URL: http://svn.apache.org/viewvc?rev=1856089&view=rev
Log:
Pull out caller actions from AC_CACHE_CHECK in APR_CHECK_TYPES_FMT_COMPATIBLE.

This allows to print results in the correct order when the function is chained.

Modified:
    apr/apr/trunk/build/apr_common.m4

Modified: apr/apr/trunk/build/apr_common.m4
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/apr_common.m4?rev=1856089&r1=1856088&r2=1856089&view=diff
==============================================================================
--- apr/apr/trunk/build/apr_common.m4 (original)
+++ apr/apr/trunk/build/apr_common.m4 Fri Mar 22 23:11:04 2019
@@ -975,8 +975,8 @@ AC_SUBST(MKDEP)
 ])
 
 dnl
-dnl APR_CHECK_TYPES_COMPATIBLE(TYPE-1, TYPE-2, FMT-TAG, 
-dnl                            [ACTION-IF-TRUE], [ACTION-IF-FALSE])
+dnl APR_CHECK_TYPES_FMT_COMPATIBLE(TYPE-1, TYPE-2, FMT-TAG, 
+dnl                                [ACTION-IF-TRUE], [ACTION-IF-FALSE])
 dnl
 dnl Try to determine whether two types are the same and accept the given
 dnl printf formatter (bare token, e.g. literal d, ld, etc).
@@ -995,9 +995,14 @@ APR_TRY_COMPILE_NO_WARNING([#include <sy
     ptr1 = &chk2;
     *ptr1 = *ptr2 = 0;
     printf("%$3 %$3", chk1, chk2);
-], [apr_cvname=yes
-$4], [apr_cvname=no
-$5])])
+], [apr_cvname=yes], [apr_cvname=no])])
+if test "$apr_cvname" = "yes"; then
+    :
+    $4
+else
+    :
+    $5
+fi
 ])
 
 dnl