From: Dr. David von Oheimb <David.von.Oheimb@siemens.com>
Date: Tue, 22 Oct 2019 11:38:16 +0000 (+0200)
Subject: re-add definition of OPENSSL_MSTR deleted from opensslv.h in macros.h
X-Git-Tag: openssl-3.0.0-alpha1~971
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=932748fe2ee09c2974ccca82755d35aedb048035;p=oweals%2Fopenssl.git

re-add definition of OPENSSL_MSTR deleted from opensslv.h in macros.h

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/10236)
---

diff --git a/include/openssl/macros.h b/include/openssl/macros.h
index 0c45580405..8548bde542 100644
--- a/include/openssl/macros.h
+++ b/include/openssl/macros.h
@@ -13,6 +13,10 @@
 #ifndef OPENSSL_MACROS_H
 # define OPENSSL_MACROS_H
 
+/* Helper macros for CPP string composition */
+# define OPENSSL_MSTR_HELPER(x) #x
+# define OPENSSL_MSTR(x) OPENSSL_MSTR_HELPER(x)
+
 /*
  * Sometimes OPENSSSL_NO_xxx ends up with an empty file and some compilers
  * don't like that.  This will hopefully silence them.