Commit 0eff84f8 authored by Karel Slaný's avatar Karel Slaný

Rearranged include statements so that ldns/config.h is not necessary.

parent 04ce6bc9
......@@ -37,6 +37,7 @@ OpenSSL used as well as that of the covered work.
#include <assert.h>
#include <errno.h>
#include <inttypes.h>
#include <stdarg.h>
#include <stdbool.h>
#include <stdio.h>
......@@ -51,12 +52,14 @@ OpenSSL used as well as that of the covered work.
#if TGT_SYSTEM == TGT_WIN
/* Windows */
#include "ldns/config.h"
#include <winsock2.h>
#include <ws2tcpip.h>
const char *inet_ntop(int af, const void *src, char *dst, size_t size);
int inet_pton(int af, const char* src, void* dst);
//#include "ldns/config.h"
#include "ldns/ldns.h"
//#include "libunbound/unbound.h"
#include "unbound.h"
#include <winsock2.h>
#include <ws2tcpip.h>
#include <iphlpapi.h>
#include <winreg.h>
#if malloc == rpl_malloc
......
......@@ -33,6 +33,9 @@ OpenSSL used as well as that of the covered work.
#include "config_related.h"
/* These have to be included before OpenSSL. */
#include <winsock2.h>
#include <wincrypt.h>
#include "ca_stores.h"
#include "common.h"
......@@ -41,12 +44,10 @@ OpenSSL used as well as that of the covered work.
#include "openssl/x509.h"
#include "openssl/evp.h"
#include "ldns/config.h"
//#include "ldns/config.h"
//#include "ldns/ldns.h"
//#include "libunbound/unbound.h"
#include <wincrypt.h>
#define MY_ENCODING_TYPE (PKCS_7_ASN_ENCODING | X509_ASN_ENCODING)
#ifndef CERT_SYSTEM_STORE_CURRENT_USER
......
......@@ -51,12 +51,19 @@ OpenSSL used as well as that of the covered work.
#include <errno.h>
#include <inttypes.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#if TGT_SYSTEM == TGT_WIN
/* These have to be included before OpenSSL. */
#include <winsock2.h>
#include <wincrypt.h>
#endif /**/
#include "ldns/wire2host.h"
#include "openssl/bio.h"
#include "openssl/evp.h"
......@@ -70,14 +77,13 @@ OpenSSL used as well as that of the covered work.
#if TGT_SYSTEM == TGT_WIN
/* Windows */
#include "ldns/config.h"
//#include "ldns/config.h"
#include <ws2tcpip.h>
//#include "ldns/config.h"
#include "ldns/ldns.h"
// #include "libunbound/unbound.h"
#include "unbound.h"
#include <wincrypt.h>
#include <winsock2.h>
#include <ws2tcpip.h>
#include <iphlpapi.h>
#include <winreg.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment