feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

switch --enable-noInline to enable/disable-inline to match all others

Browse Source
This commit is contained in:
toddouska
2013-03-13 12:25:34 -07:00
parent 975ffe693b
commit 129de03da0
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
configure.ac
View File

@@ -911,19 +911,19 @@ else
fi fi
# No inline Build # inline Build
AC_ARG_ENABLE([noInline], AC_ARG_ENABLE([inline],
[ --enable-noInline Enable No inline (default: disabled)], [ --enable-inline Enable inline functions (default: disabled)],
[ ENABLED_NOINLINE=$enableval ], [ ENABLED_INLINE=$enableval ],
[ ENABLED_NOINLINE=no ] [ ENABLED_INLINE=yes ]
) )
if test "$ENABLED_NOINLINE" = "yes" if test "$ENABLED_INLINE" = "no"
then then
AM_CFLAGS="$AM_CFLAGS -DNO_INLINE" AM_CFLAGS="$AM_CFLAGS -DNO_INLINE"
fi fi
AM_CONDITIONAL([BUILD_NOINLINE], [test "x$ENABLED_NOINLINE" = "xyes"]) AM_CONDITIONAL([BUILD_INLINE], [test "x$ENABLED_INLINE" = "xyes"])
# OCSP # OCSP
@@ -1081,6 +1081,7 @@ AC_ARG_ENABLE([examples],
AS_IF([test "x$ENABLED_SINGLETHREADED" = "xyes"], [ENABLED_EXAMPLES="no"]) 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_FILESYSTEM" = "xno"], [ENABLED_EXAMPLES="no"])
AS_IF([test "x$ENABLED_INLINE" = "xno"], [ENABLED_EXAMPLES="no"])
# certs still have sha signatures for now # certs still have sha signatures for now
AS_IF([test "x$ENABLED_SHA" = "xno"], [ENABLED_EXAMPLES="no"]) AS_IF([test "x$ENABLED_SHA" = "xno"], [ENABLED_EXAMPLES="no"])
AM_CONDITIONAL([BUILD_EXAMPLES], [test "x$ENABLED_EXAMPLES" = "xyes"]) AM_CONDITIONAL([BUILD_EXAMPLES], [test "x$ENABLED_EXAMPLES" = "xyes"])

2
src/include.am
View File

@@ -103,7 +103,7 @@ if BUILD_RABBIT
src_libcyassl_la_SOURCES += ctaocrypt/src/rabbit.c src_libcyassl_la_SOURCES += ctaocrypt/src/rabbit.c
endif endif
if BUILD_NOINLINE if !BUILD_INLINE
src_libcyassl_la_SOURCES += ctaocrypt/src/misc.c src_libcyassl_la_SOURCES += ctaocrypt/src/misc.c
endif endif

4
src/internal.c
View File

@@ -222,12 +222,16 @@ static INLINE void ato16(const byte* c, word16* u16)
} }
#ifdef CYASSL_DTLS
/* convert opaque to 32 bit integer */ /* convert opaque to 32 bit integer */
static INLINE void ato32(const byte* c, word32* u32) static INLINE void ato32(const byte* c, word32* u32)
{ {
*u32 = (c[0] << 24) | (c[1] << 16) | (c[2] << 8) | c[3]; *u32 = (c[0] << 24) | (c[1] << 16) | (c[2] << 8) | c[3];
} }
#endif /* CYASSL_DTLS */
#ifdef HAVE_LIBZ #ifdef HAVE_LIBZ