[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  7a93c858263ab0f2719da9c3bb4d0ba68afac79c (commit)
      from  9391ba1b51fac77a1255f3d9a0d275e4cce9d543 (commit)


- Log -----------------------------------------------------------------
commit 7a93c858263ab0f2719da9c3bb4d0ba68afac79c
Author: Matt Caswell <matt at openssl.org>
Date:   Sat Dec 12 14:26:22 2015 +0000

    Fix compile failure with no-threads
    
    The async code was causing a compile failure if no-threads was used.
    
    Reviewed-by: Kurt Roeckx <kurt at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/async/arch/async_null.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/async/arch/async_null.h b/crypto/async/arch/async_null.h
index 684e373..72a888a 100644
--- a/crypto/async/arch/async_null.h
+++ b/crypto/async/arch/async_null.h
@@ -69,7 +69,7 @@ typedef struct async_fibre_st {
 # define async_set_ctx(nctx)                    0
 # define async_get_ctx()                        ((async_ctx *)NULL)
 # define async_fibre_swapcontext(o,n,r)         0
-# define async_fibre_makecontext(c)
+# define async_fibre_makecontext(c)             0
 # define async_fibre_free(f)
 # define async_fibre_init_dispatcher(f)
 # define async_get_pool()                       NULL