* add autoconf test AC_C_INLINE to do the Right Thing for "inline", "__inline__"...

* make tr_isAddress(), tr_isDirection(), and a bunch of the tr_torrent() macro functions into true inline functions

diff --git a/configure.ac b/configure.ac
index e72e7042430772cf96779275b8eb3adcba71f476..b986567a0d80c87be54071e1ae04090b403413b9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -47,6 +47,7 @@ AC_SUBST(DBUS_GLIB_MINIMUM)
 
 AC_PROG_CC
 AC_PROG_CXX
+AC_C_INLINE
 if test "x$GCC" = "xyes" ; then
     CFLAGS="-Wall -Wformat-security -W -Wmissing-prototypes -Wdeclaration-after-statement"
     CXXFLAGS="-Wall -Wformat-security -W"

diff --git a/libtransmission/net.h b/libtransmission/net.h
index 1953557fff659e05b0ab8162786928f8aa9e61a0..4585aea0996a13744bbfbc3186f361025cdd6f00 100644 (file)
--- a/libtransmission/net.h
+++ b/libtransmission/net.h
@@ -87,7 +87,7 @@ void tr_normalizeV4Mapped( tr_address * const addr );
 
 void tr_suspectAddress( const tr_address * a, const char * source );
 
-#define tr_isAddress(a) ( ((a)!=NULL) && ( (a)->type==TR_AF_INET || (a)->type==TR_AF_INET6 ) )
+static inline tr_bool tr_isAddress( const tr_address * a ) { return ( a != NULL ) && ( a->type==TR_AF_INET || a->type==TR_AF_INET6 ); }
 
 typedef struct tr_net_af_support
 {

diff --git a/libtransmission/transmission.h b/libtransmission/transmission.h
index 24ff8afdc20d5db5f0833f864d6ede66c4a91097..c808941dca22517bb94d5d127526b7fa23552e4f 100644 (file)
--- a/libtransmission/transmission.h
+++ b/libtransmission/transmission.h
@@ -1415,7 +1415,7 @@ void tr_torrentSetDoneDate( tr_torrent  * torrent,
                             time_t        doneDate );
 
 /** @brief Sanity checker to test that the direction is TR_UP or TR_DOWN */
-#define tr_isDirection(d) (((d)==TR_UP) || ((d)==TR_DOWN))
+static inline tr_bool tr_isDirection( tr_direction d ) { return d==TR_UP || d==TR_DOWN; }
 
 /** @} */