svn commit: r1597962 - in /subversion/trunk: configure.ac subversion/svn_private_config.hw

[st...@apache.org]

Author: stefan2
Date: Wed May 28 10:25:45 2014
New Revision: 1597962

URL: http://svn.apache.org/r1597962
Log:
Fix GCC's "always_inline function might not be inlinable" warning.
As it turns out, these functions must also be marked as "inline"
if we want to enforce inlining.

Once at it, make the forced inline macro fall back to at least
APR-defined inlining (instead of no decoration at all) if there
is no way to enforce it.

* configure.ac
  (AH_BOTTOM): Make SVN__FORCE_INLINE imply APR_INLINE when not in
               SVN_DEBUG mode.

* subversion/svn_private_config.hw
  (SVN__FORCE_INLINE): Fall back to APR_INLINE in non-SVN_DEBUG mode
                       when not using Visual C.

Modified:
    subversion/trunk/configure.ac
    subversion/trunk/subversion/svn_private_config.hw

Modified: subversion/trunk/configure.ac
URL: http://svn.apache.org/viewvc/subversion/trunk/configure.ac?rev=1597962&r1=1597961&r2=1597962&view=diff
==============================================================================
--- subversion/trunk/configure.ac (original)
+++ subversion/trunk/configure.ac Wed May 28 10:25:45 2014
@@ -773,10 +773,10 @@ AH_BOTTOM([
 # define SVN__FORCE_INLINE
 # define SVN__PREVENT_INLINE
 #elif defined(__GNUC__)
-# define SVN__FORCE_INLINE __attribute__ ((always_inline))
+# define SVN__FORCE_INLINE APR_INLINE __attribute__ ((always_inline))
 # define SVN__PREVENT_INLINE __attribute__ ((noinline))
 #else
-# define SVN__FORCE_INLINE
+# define SVN__FORCE_INLINE APR_INLINE
 # define SVN__PREVENT_INLINE
 #endif
 ])

Modified: subversion/trunk/subversion/svn_private_config.hw
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn_private_config.hw?rev=1597962&r1=1597961&r2=1597962&view=diff
==============================================================================
--- subversion/trunk/subversion/svn_private_config.hw (original)
+++ subversion/trunk/subversion/svn_private_config.hw Wed May 28 10:25:45 2014
@@ -111,7 +111,7 @@
 # define SVN__FORCE_INLINE __forceinline
 # define SVN__PREVENT_INLINE __declspec(noinline)
 #else
-# define SVN__FORCE_INLINE
+# define SVN__FORCE_INLINE APR_INLINE
 # define SVN__PREVENT_INLINE
 #endif