diff options
| author | Jack Lloyd <[email protected]> | 2015-08-29 10:06:34 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2015-08-29 10:06:34 -0400 |
| commit | e4962bebbc687e93e47d35339b6a2242aefee51e (patch) | |
| tree | 5aa5a714c670f8928ad16d379328b5426189f45a | |
| parent | 82bb7758f963c5790bbedc44169207fcbeaa40fa (diff) | |
Remove unneeded includes and clean up socket feature test
| -rw-r--r-- | src/cmd/apps.h | 6 | ||||
| -rw-r--r-- | src/cmd/credentials.h | 5 | ||||
| -rw-r--r-- | src/cmd/tls_client.cpp | 5 | ||||
| -rw-r--r-- | src/cmd/tls_server.cpp | 4 |
4 files changed, 8 insertions, 12 deletions
diff --git a/src/cmd/apps.h b/src/cmd/apps.h index bcb860fb4..d56fab5ad 100644 --- a/src/cmd/apps.h +++ b/src/cmd/apps.h @@ -68,3 +68,9 @@ class AppRegistrations }; #define REGISTER_APP(nm) AppRegistrations::AppRegistration g_ ## nm ## _registration(#nm, nm) + +#if defined(BOTAN_TARGET_OS_IS_WINDOWS) || defined(BOTAN_TARGET_OS_IS_MINGW) + #undef BOTAN_TARGET_OS_HAS_SOCKETS +#else + #define BOTAN_TARGET_OS_HAS_SOCKETS +#endif diff --git a/src/cmd/credentials.h b/src/cmd/credentials.h index f7109e1a3..06349657d 100644 --- a/src/cmd/credentials.h +++ b/src/cmd/credentials.h @@ -10,11 +10,6 @@ #include <botan/pkcs8.h> #include <botan/credentials_manager.h> #include <botan/x509self.h> -#include <botan/rsa.h> -#include <botan/dsa.h> -#include <botan/srp6.h> -#include <botan/srp6_files.h> -#include <botan/ecdsa.h> #include <iostream> #include <fstream> #include <memory> diff --git a/src/cmd/tls_client.cpp b/src/cmd/tls_client.cpp index a5da299c6..f9d32ea6c 100644 --- a/src/cmd/tls_client.cpp +++ b/src/cmd/tls_client.cpp @@ -6,10 +6,7 @@ #include "apps.h" -#if defined(BOTAN_HAS_TLS) \ - && defined(BOTAN_HAS_DSA) \ - && !defined(BOTAN_TARGET_OS_IS_WINDOWS) \ - && !defined(BOTAN_TARGET_OS_IS_MINGW) +#if defined(BOTAN_HAS_TLS) && defined(BOTAN_TARGET_OS_HAS_SOCKETS) #include <botan/tls_client.h> #include <botan/pkcs8.h> diff --git a/src/cmd/tls_server.cpp b/src/cmd/tls_server.cpp index 744ab5544..cd95cf0d6 100644 --- a/src/cmd/tls_server.cpp +++ b/src/cmd/tls_server.cpp @@ -7,9 +7,7 @@ #include "apps.h" -#if defined(BOTAN_HAS_TLS) && defined(BOTAN_HAS_DSA) \ - && !defined(BOTAN_TARGET_OS_IS_WINDOWS) \ - && !defined(BOTAN_TARGET_OS_IS_MINGW) +#if defined(BOTAN_HAS_TLS) && defined(BOTAN_TARGET_OS_HAS_SOCKETS) #include <botan/tls_server.h> #include <botan/hex.h> |