From 129de03da01da5a74110c1db5f38a4a3c02570f2 Mon Sep 17 00:00:00 2001 From: toddouska Date: Wed, 13 Mar 2013 12:25:34 -0700 Subject: [PATCH] switch --enable-noInline to enable/disable-inline to match all others --- configure.ac | 15 ++++++++------- src/include.am | 2 +- src/internal.c | 4 ++++ 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 7ca96602a..a35ba01e8 100644 --- a/configure.ac +++ b/configure.ac @@ -911,19 +911,19 @@ else fi -# No inline Build -AC_ARG_ENABLE([noInline], - [ --enable-noInline Enable No inline (default: disabled)], - [ ENABLED_NOINLINE=$enableval ], - [ ENABLED_NOINLINE=no ] +# inline Build +AC_ARG_ENABLE([inline], + [ --enable-inline Enable inline functions (default: disabled)], + [ ENABLED_INLINE=$enableval ], + [ ENABLED_INLINE=yes ] ) -if test "$ENABLED_NOINLINE" = "yes" +if test "$ENABLED_INLINE" = "no" then AM_CFLAGS="$AM_CFLAGS -DNO_INLINE" fi -AM_CONDITIONAL([BUILD_NOINLINE], [test "x$ENABLED_NOINLINE" = "xyes"]) +AM_CONDITIONAL([BUILD_INLINE], [test "x$ENABLED_INLINE" = "xyes"]) # OCSP @@ -1081,6 +1081,7 @@ AC_ARG_ENABLE([examples], AS_IF([test "x$ENABLED_SINGLETHREADED" = "xyes"], [ENABLED_EXAMPLES="no"]) AS_IF([test "x$ENABLED_FILESYSTEM" = "xno"], [ENABLED_EXAMPLES="no"]) +AS_IF([test "x$ENABLED_INLINE" = "xno"], [ENABLED_EXAMPLES="no"]) # certs still have sha signatures for now AS_IF([test "x$ENABLED_SHA" = "xno"], [ENABLED_EXAMPLES="no"]) AM_CONDITIONAL([BUILD_EXAMPLES], [test "x$ENABLED_EXAMPLES" = "xyes"]) diff --git a/src/include.am b/src/include.am index 88e20590e..4807557b2 100644 --- a/src/include.am +++ b/src/include.am @@ -103,7 +103,7 @@ if BUILD_RABBIT src_libcyassl_la_SOURCES += ctaocrypt/src/rabbit.c endif -if BUILD_NOINLINE +if !BUILD_INLINE src_libcyassl_la_SOURCES += ctaocrypt/src/misc.c endif diff --git a/src/internal.c b/src/internal.c index 939709a38..a61148285 100644 --- a/src/internal.c +++ b/src/internal.c @@ -222,12 +222,16 @@ static INLINE void ato16(const byte* c, word16* u16) } +#ifdef CYASSL_DTLS + /* convert opaque to 32 bit integer */ static INLINE void ato32(const byte* c, word32* u32) { *u32 = (c[0] << 24) | (c[1] << 16) | (c[2] << 8) | c[3]; } +#endif /* CYASSL_DTLS */ + #ifdef HAVE_LIBZ