Index: src/X509Certificate.m ================================================================== --- src/X509Certificate.m +++ src/X509Certificate.m @@ -19,22 +19,10 @@ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#if defined(__clang__) -# pragma clang diagnostic push -# pragma clang diagnostic ignored "-Wdocumentation" -#endif - -#include -#include - -#if defined(__clang__) -# pragma clang diagnostic pop -#endif - #import "X509Certificate.h" #import #import #import @@ -44,10 +32,27 @@ #import #import #import #import + +#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 +#include + +#if defined(__clang__) +# pragma clang diagnostic pop +#endif OF_ASSUME_NONNULL_BEGIN @interface X509Certificate () - (bool)X509_isAssertedDomain: (OFString *)asserted