[openssl] master update

[nic.tuv at gmail.com]

The branch master has been updated
       via  732e24bb14ea9c4f68b8c9cd2bf605e0bd6b498e (commit)
      from  6d4313f03eddd39ca8d06a5e1d20fc1adcb207c5 (commit)


- Log -----------------------------------------------------------------
commit 732e24bb14ea9c4f68b8c9cd2bf605e0bd6b498e
Author: Romain Geissler <romain.geissler at amadeus.com>
Date:   Thu Jan 7 16:54:58 2021 +0000

    Fix simpledynamic test compilation when condigured without DSO support.
    
    This fixes this compilation error:
    In file included from test/simpledynamic.c:13:
    test/simpledynamic.h:39:35: error: unknown type name 'SD'
       39 | int sd_load(const char *filename, SD *sd, int type);
          |                                   ^~
    test/simpledynamic.h:40:12: error: unknown type name 'SD'
       40 | int sd_sym(SD sd, const char *symname, SD_SYM *sym);
          |            ^~
    test/simpledynamic.h:40:40: error: unknown type name 'SD_SYM'
       40 | int sd_sym(SD sd, const char *symname, SD_SYM *sym);
          |                                        ^~~~~~
    test/simpledynamic.h:41:14: error: unknown type name 'SD'
       41 | int sd_close(SD lib);
          |              ^~
    make[1]: *** [Makefile:24670: test/moduleloadtest-bin-simpledynamic.o] Error 1
    make[1]: *** Waiting for unfinished jobs....
    In file included from test/moduleloadtest.c:19:
    test/simpledynamic.h:39:35: error: unknown type name 'SD'
       39 | int sd_load(const char *filename, SD *sd, int type);
          |                                   ^~
    test/simpledynamic.h:40:12: error: unknown type name 'SD'
       40 | int sd_sym(SD sd, const char *symname, SD_SYM *sym);
          |            ^~
    test/simpledynamic.h:40:40: error: unknown type name 'SD_SYM'
       40 | int sd_sym(SD sd, const char *symname, SD_SYM *sym);
          |                                        ^~~~~~
    test/simpledynamic.h:41:14: error: unknown type name 'SD'
       41 | int sd_close(SD lib);
          |              ^~
    
    Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/13802)

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

Summary of changes:
 test/simpledynamic.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/simpledynamic.h b/test/simpledynamic.h
index cc4aed5c43..247b49f7fe 100644
--- a/test/simpledynamic.h
+++ b/test/simpledynamic.h
@@ -36,9 +36,11 @@ typedef void *SD_SYM;
 
 # endif
 
+# if defined(DSO_DLFCN) || defined(DSO_WIN32)
 int sd_load(const char *filename, SD *sd, int type);
 int sd_sym(SD sd, const char *symname, SD_SYM *sym);
 int sd_close(SD lib);
 const char *sd_error(void);
+# endif
 
 #endif