[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  c3a64b52788df139d649efaaf993c27dc89ba6ce (commit)
      from  cd1a88b3279a633f16c1a177574a83123c89c8b8 (commit)


- Log -----------------------------------------------------------------
commit c3a64b52788df139d649efaaf993c27dc89ba6ce
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Apr 14 13:37:41 2016 +0100

    The err_cleanup() funtion is internal so shouldn't be exported
    
    Running a "make update" wanted to add err_cleanup to libcrypto.num which
    is wrong.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 crypto/err/err.c                  | 2 +-
 crypto/include/internal/err_int.h | 1 +
 include/internal/err.h            | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crypto/err/err.c b/crypto/err/err.c
index aff3ae5..b0fd19e 100644
--- a/crypto/err/err.c
+++ b/crypto/err/err.c
@@ -114,11 +114,11 @@
 #include <internal/cryptlib_int.h>
 #include <internal/threads.h>
 #include <internal/err.h>
+#include <internal/err_int.h>
 #include <openssl/lhash.h>
 #include <openssl/crypto.h>
 #include <openssl/buffer.h>
 #include <openssl/bio.h>
-#include "internal/err.h"
 #include <openssl/opensslconf.h>
 
 static void err_load_strings(int lib, ERR_STRING_DATA *str);
diff --git a/crypto/include/internal/err_int.h b/crypto/include/internal/err_int.h
index ad3f7ce..7f1037e 100644
--- a/crypto/include/internal/err_int.h
+++ b/crypto/include/internal/err_int.h
@@ -12,5 +12,6 @@
 # define INTERNAL_ERR_INT_H
 
 void err_load_crypto_strings_int(void);
+void err_cleanup(void);
 
 #endif
diff --git a/include/internal/err.h b/include/internal/err.h
index 415f578..de2180b 100644
--- a/include/internal/err.h
+++ b/include/internal/err.h
@@ -59,6 +59,5 @@
 # define INTERNAL_ERR_H
 
 void err_free_strings_int(void);
-void err_cleanup(void);
 
 #endif