]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
build_wincrypt_test.c: Fix compilation with MSVC
authorMathias Berchtold <mberchtold@gmail.com>
Fri, 21 Apr 2023 23:16:39 +0000 (17:16 -0600)
committerTomas Mraz <tomas@openssl.org>
Thu, 21 Nov 2024 10:31:32 +0000 (11:31 +0100)
Fixes issue https://github.com/openssl/openssl/issues/20805

Reviewed-by: Todd Short <todd.short@me.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(cherry picked from commit b5a635dc2113e1bc807ea358a670146c813df989)

Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/26018)

test/build_wincrypt_test.c

index 5bd75e6a43288b74ad563755b93a4356764586ba..0c0a54652767bf384b99509a9c055ad5fc110f21 100644 (file)
 # include <wincrypt.h>
 # ifndef X509_NAME
 #  ifndef PEDANTIC
-#   warning "wincrypt.h no longer defining X509_NAME before OpenSSL headers"
+#    ifdef _MSC_VER
+#      pragma message("wincrypt.h no longer defining X509_NAME before OpenSSL headers")
+#    else
+#      warning "wincrypt.h no longer defining X509_NAME before OpenSSL headers"
+#    endif
 #  endif
 # endif
 #endif