Commit 4431107d authored by Richard Levitte's avatar Richard Levitte
Browse files

Guard DECLARE_DEPRECATED against multiple includes of opensslconf.h 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6689)
parent 4e351ca9

include/openssl/opensslconf.h.in

+7 −5
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ extern "C" { 
 * still won't see them if the library has been built to disable deprecated

 * functions.

 */

#ifndef DECLARE_DEPRECATED

# define DECLARE_DEPRECATED(f)   f;

# ifdef __GNUC__

#  if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0)
@@ -75,6 +76,7 @@ extern "C" { 
#   define DECLARE_DEPRECATED(f)    f __attribute__ ((deprecated));

#  endif

# endif

#endif



#ifndef OPENSSL_FILE

# ifdef OPENSSL_NO_FILENAMES