ObjFW/ObjOpenSSL
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix compilation on Windows

Browse source 
FossilOrigin-Name: 5492e91aadc0860715114eed607b75d7d700d5f01997ccb299514b790a861d25
This commit is contained in:
Jonathan Schleifer 2020-08-29 14:42:32 +00:00
parent 0862369941
commit cfd63f75cf
1 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/X509Certificate.m
View file

@ -21,18 +21,6 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#if defined(__clang__)
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wdocumentation"
#endif
#include <openssl/crypto.h>
#include <openssl/x509v3.h>
#if defined(__clang__)
# pragma clang diagnostic pop
#endif
#import "X509Certificate.h" #import "X509Certificate.h"
#import <ObjFW/OFArray.h> #import <ObjFW/OFArray.h>
@ -47,6 +35,23 @@
#import <ObjFW/macros.h> #import <ObjFW/macros.h>
#if defined(__clang__)
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wdocumentation"
#endif
#ifdef X509_NAME
/* wincrypt.h has a conflicting define. */
# undef X509_NAME
#endif
#include <openssl/crypto.h>
#include <openssl/x509v3.h>
#if defined(__clang__)
# pragma clang diagnostic pop
#endif
OF_ASSUME_NONNULL_BEGIN OF_ASSUME_NONNULL_BEGIN
@interface X509Certificate () @interface X509Certificate ()