[btls] Fixes for windows. (mono#8653)

* [btls] Do not give gcc flags to msvc. * [btls] #include "btls-foo.h" instead of #include <btls-foo.h> to work with existing build system, on Windows, with out-of-tree build. Not sure which factor does not like <> but "" should be ok. * [blts] MONO_API is not used consistently and therefore errors on Windows. 1. Make it be nothing. 1b. Use a .def file if there are actual exports. Really, .def files are a good idea. or 2. Use it consistently. This does #1.
madewokherd · May 10, 2018 · baf58ed · baf58ed
1 parent a7bebe7
commit baf58ed
Show file tree

Hide file tree

Showing 34 changed files with 62 additions and 57 deletions.
diff --git a/mono/btls/CMakeLists.txt b/mono/btls/CMakeLists.txt
@@ -28,7 +28,9 @@ if (NOT "${BTLS_ARCH}" STREQUAL "")
 	set (CMAKE_SYSTEM_PROCESSOR "${BTLS_ARCH}")
 endif ()
 
-set (C_CXX_FLAGS "-Wall -Wsign-compare -Wmissing-field-initializers -fPIC -ggdb -fvisibility=hidden")
+if (NOT MSVC)
+	set (C_CXX_FLAGS "-Wall -Wsign-compare -Wmissing-field-initializers -fPIC -ggdb -fvisibility=hidden")
+endif ()
 
 set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${C_CXX_FLAGS} ${BTLS_CFLAGS}")
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${C_CXX_FLAGS} ${BTLS_CFLAGS}")

diff --git a/mono/btls/btls-bio.c b/mono/btls/btls-bio.c
@@ -6,8 +6,8 @@
 //  Copyright (c) 2015 Xamarin. All rights reserved.
 //
 
-#include <btls-ssl.h>
-#include <btls-bio.h>
+#include "btls-ssl.h"
+#include "btls-bio.h"
 #include <errno.h>
 
 struct MonoBtlsBio {

diff --git a/mono/btls/btls-bio.h b/mono/btls/btls-bio.h
@@ -10,7 +10,7 @@
 #define __btls__btls_bio__
 
 #include <stdio.h>
-#include <btls-ssl.h>
+#include "btls-ssl.h"
 
 typedef enum {
 	MONO_BTLS_CONTROL_COMMAND_FLUSH	= 1

diff --git a/mono/btls/btls-error.c b/mono/btls/btls-error.c
@@ -6,8 +6,8 @@
 //  Copyright © 2016 Xamarin. All rights reserved.
 //
 
-#include <btls-error.h>
-#include <btls-util.h>
+#include "btls-error.h"
+#include "btls-util.h"
 #include <assert.h>
 
 MONO_API int

diff --git a/mono/btls/btls-key.c b/mono/btls/btls-key.c
@@ -6,7 +6,7 @@
 //  Copyright © 2016 Xamarin. All rights reserved.
 //
 
-#include <btls-key.h>
+#include "btls-key.h"
 
 MONO_API EVP_PKEY *
 mono_btls_key_new ()

diff --git a/mono/btls/btls-key.h b/mono/btls/btls-key.h
@@ -10,8 +10,8 @@
 #define __btls__btls_key__
 
 #include <stdio.h>
-#include <btls-ssl.h>
-#include <btls-x509.h>
+#include "btls-ssl.h"
+#include "btls-x509.h"
 
 EVP_PKEY *
 mono_btls_key_new ();

diff --git a/mono/btls/btls-pkcs12.c b/mono/btls/btls-pkcs12.c
@@ -6,7 +6,7 @@
 //  Copyright © 2016 Xamarin. All rights reserved.
 //
 
-#include <btls-pkcs12.h>
+#include "btls-pkcs12.h"
 #include <openssl/pkcs12.h>
 
 struct MonoBtlsPkcs12 {

diff --git a/mono/btls/btls-pkcs12.h b/mono/btls/btls-pkcs12.h
@@ -10,8 +10,8 @@
 #define __btls__btls_pkcs12__
 
 #include <stdio.h>
-#include <btls-ssl.h>
-#include <btls-x509.h>
+#include "btls-ssl.h"
+#include "btls-x509.h"
 
 MonoBtlsPkcs12 *
 mono_btls_pkcs12_new (void);

diff --git a/mono/btls/btls-ssl-ctx.c b/mono/btls/btls-ssl-ctx.c
@@ -6,8 +6,8 @@
 //  Copyright © 2016 Xamarin. All rights reserved.
 //
 
-#include <btls-ssl-ctx.h>
-#include <btls-x509-verify-param.h>
+#include "btls-ssl-ctx.h"
+#include "btls-x509-verify-param.h"
 
 struct MonoBtlsSslCtx {
 	CRYPTO_refcount_t references;

diff --git a/mono/btls/btls-ssl-ctx.h b/mono/btls/btls-ssl-ctx.h
@@ -13,7 +13,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <openssl/ssl.h>
-#include <btls-util.h>
+#include "btls-util.h"
 
 typedef struct MonoBtlsBio MonoBtlsBio;
 typedef struct MonoBtlsX509Chain MonoBtlsX509Chain;

diff --git a/mono/btls/btls-ssl.c b/mono/btls/btls-ssl.c
@@ -6,8 +6,8 @@
 //  Copyright (c) 2015 Xamarin. All rights reserved.
 //
 
-#include <btls-ssl.h>
-#include <btls-x509-verify-param.h>
+#include "btls-ssl.h"
+#include "btls-x509-verify-param.h"
 
 struct MonoBtlsSsl {
 	MonoBtlsSslCtx *ctx;

diff --git a/mono/btls/btls-ssl.h b/mono/btls/btls-ssl.h
@@ -9,7 +9,7 @@
 #ifndef __btls__btls_ssl__
 #define __btls__btls_ssl__
 
-#include <btls-ssl-ctx.h>
+#include "btls-ssl-ctx.h"
 
 MonoBtlsSsl *
 mono_btls_ssl_new (MonoBtlsSslCtx *ctx);

diff --git a/mono/btls/btls-util.c b/mono/btls/btls-util.c
@@ -6,7 +6,7 @@
 //  Copyright © 2016 Xamarin. All rights reserved.
 //
 
-#include <btls-util.h>
+#include "btls-util.h"
 #include <assert.h>
 // #include <time.h>
 

diff --git a/mono/btls/btls-util.h b/mono/btls/btls-util.h
@@ -17,7 +17,10 @@
 #ifndef MONO_API
 #if defined(_MSC_VER)
 
-#define MONO_API __declspec(dllexport)
+// MONO_API is not used consistently and therefore errors.
+// .def file is preferred.
+//#define MONO_API __declspec(dllexport)
+#define MONO_API /* nothing */
 
 #else
 

diff --git a/mono/btls/btls-x509-chain.c b/mono/btls/btls-x509-chain.c
@@ -6,7 +6,7 @@
 //  Copyright © 2016 Xamarin. All rights reserved.
 //
 
-#include <btls-x509-chain.h>
+#include "btls-x509-chain.h"
 
 struct MonoBtlsX509Chain {
 	STACK_OF(X509) *certs;

diff --git a/mono/btls/btls-x509-chain.h b/mono/btls/btls-x509-chain.h
@@ -10,8 +10,8 @@
 #define __btls__btls_x509_chain__
 
 #include <stdio.h>
-#include <btls-ssl.h>
-#include <btls-x509.h>
+#include "btls-ssl.h"
+#include "btls-x509.h"
 
 MonoBtlsX509Chain *
 mono_btls_x509_chain_new (void);

diff --git a/mono/btls/btls-x509-crl.c b/mono/btls/btls-x509-crl.c
@@ -6,8 +6,8 @@
 //  Copyright © 2016 Xamarin. All rights reserved.
 //
 
-#include <btls-x509-crl.h>
-#include <btls-x509-revoked.h>
+#include "btls-x509-crl.h"
+#include "btls-x509-revoked.h"
 
 struct MonoBtlsX509Crl {
 	X509_CRL *crl;

diff --git a/mono/btls/btls-x509-crl.h b/mono/btls/btls-x509-crl.h
@@ -10,8 +10,8 @@
 #define __btls__btls_x509_crl__
 
 #include <stdio.h>
-#include <btls-ssl.h>
-#include <btls-x509.h>
+#include "btls-ssl.h"
+#include "btls-x509.h"
 
 MonoBtlsX509Crl *
 mono_btls_x509_crl_from_data (const void *buf, int len, MonoBtlsX509Format format);

diff --git a/mono/btls/btls-x509-lookup-mono.c b/mono/btls/btls-x509-lookup-mono.c
@@ -6,8 +6,8 @@
 //  Copyright © 2016 Xamarin. All rights reserved.
 //
 
-#include <btls-x509-lookup.h>
-#include <btls-x509-lookup-mono.h>
+#include "btls-x509-lookup.h"
+#include "btls-x509-lookup-mono.h"
 #include <openssl/stack.h>
 
 // random high number

diff --git a/mono/btls/btls-x509-lookup-mono.h b/mono/btls/btls-x509-lookup-mono.h
@@ -10,9 +10,9 @@
 #define __btls__btls_x509_lookup_mono__
 
 #include <stdio.h>
-#include <btls-ssl.h>
-#include <btls-x509.h>
-#include <btls-x509-store.h>
+#include "btls-ssl.h"
+#include "btls-x509.h"
+#include "btls-x509-store.h"
 
 typedef int (* MonoBtlsX509LookupMono_BySubject) (const void *instance, MonoBtlsX509Name *name, X509 **ret);
 

diff --git a/mono/btls/btls-x509-lookup.c b/mono/btls/btls-x509-lookup.c
@@ -6,8 +6,8 @@
 //  Copyright © 2016 Xamarin. All rights reserved.
 //
 
-#include <btls-x509-lookup.h>
-#include <btls-x509-lookup-mono.h>
+#include "btls-x509-lookup.h"
+#include "btls-x509-lookup-mono.h"
 
 struct MonoBtlsX509Lookup {
 	MonoBtlsX509LookupType type;

diff --git a/mono/btls/btls-x509-lookup.h b/mono/btls/btls-x509-lookup.h
@@ -10,9 +10,9 @@
 #define __btls__btls_x509_lookup__
 
 #include <stdio.h>
-#include <btls-ssl.h>
-#include <btls-x509.h>
-#include <btls-x509-store.h>
+#include "btls-ssl.h"
+#include "btls-x509.h"
+#include "btls-x509-store.h"
 
 typedef enum {
 	MONO_BTLS_X509_LOOKUP_TYPE_UNKNOWN = 0,

diff --git a/mono/btls/btls-x509-name.c b/mono/btls/btls-x509-name.c
@@ -6,7 +6,7 @@
 //  Copyright © 2016 Xamarin. All rights reserved.
 //
 
-#include <btls-x509-name.h>
+#include "btls-x509-name.h"
 
 struct MonoBtlsX509Name {
 	int owns;

diff --git a/mono/btls/btls-x509-name.h b/mono/btls/btls-x509-name.h
@@ -10,7 +10,7 @@
 #define __btls__btls_x509_name__
 
 #include <stdio.h>
-#include <btls-ssl.h>
+#include "btls-ssl.h"
 
 typedef enum {
 	MONO_BTLS_X509_NAME_ENTRY_TYPE_UNKNOWN = 0,

diff --git a/mono/btls/btls-x509-revoked.c b/mono/btls/btls-x509-revoked.c
@@ -6,7 +6,7 @@
 //  Copyright © 2016 Xamarin. All rights reserved.
 //
 
-#include <btls-x509-revoked.h>
+#include "btls-x509-revoked.h"
 
 struct MonoBtlsX509Revoked {
 	MonoBtlsX509Crl *owner;

diff --git a/mono/btls/btls-x509-revoked.h b/mono/btls/btls-x509-revoked.h
@@ -10,8 +10,8 @@
 #define __btls__btls_x509_revoked__
 
 #include <stdio.h>
-#include <btls-ssl.h>
-#include <btls-x509-crl.h>
+#include "btls-ssl.h"
+#include "btls-x509-crl.h"
 
 MonoBtlsX509Revoked *
 mono_btls_x509_revoked_new (MonoBtlsX509Crl *owner, X509_REVOKED *revoked);

diff --git a/mono/btls/btls-x509-store-ctx.c b/mono/btls/btls-x509-store-ctx.c
@@ -6,7 +6,7 @@
 //  Copyright © 2016 Xamarin. All rights reserved.
 //
 
-#include <btls-x509-store-ctx.h>
+#include "btls-x509-store-ctx.h"
 
 struct MonoBtlsX509StoreCtx {
 	int owns;

diff --git a/mono/btls/btls-x509-store-ctx.h b/mono/btls/btls-x509-store-ctx.h
@@ -10,11 +10,11 @@
 #define __btls__btls_x509_store_ctx__
 
 #include <stdio.h>
-#include <btls-ssl.h>
-#include <btls-x509-chain.h>
-#include <btls-x509-name.h>
-#include <btls-x509-store.h>
-#include <btls-x509-verify-param.h>
+#include "btls-ssl.h"
+#include "btls-x509-chain.h"
+#include "btls-x509-name.h"
+#include "btls-x509-store.h"
+#include "btls-x509-verify-param.h"
 
 MonoBtlsX509StoreCtx *
 mono_btls_x509_store_ctx_from_ptr (X509_STORE_CTX *ptr);

diff --git a/mono/btls/btls-x509-store.c b/mono/btls/btls-x509-store.c
@@ -6,7 +6,7 @@
 //  Copyright © 2016 Xamarin. All rights reserved.
 //
 
-#include <btls-x509-store.h>
+#include "btls-x509-store.h"
 
 struct MonoBtlsX509Store {
 	X509_STORE *store;

diff --git a/mono/btls/btls-x509-store.h b/mono/btls/btls-x509-store.h
@@ -10,7 +10,7 @@
 #define __btls__btls_x509_store__
 
 #include <stdio.h>
-#include <btls-ssl.h>
+#include "btls-ssl.h"
 
 MonoBtlsX509Store *
 mono_btls_x509_store_new (void);

diff --git a/mono/btls/btls-x509-verify-param.c b/mono/btls/btls-x509-verify-param.c
@@ -6,8 +6,8 @@
 //  Copyright © 2016 Xamarin. All rights reserved.
 //
 
-#include <btls-x509-verify-param.h>
-#include <btls-x509-store-ctx.h>
+#include "btls-x509-verify-param.h"
+#include "btls-x509-store-ctx.h"
 
 struct MonoBtlsX509VerifyParam {
 	int owns;

diff --git a/mono/btls/btls-x509-verify-param.h b/mono/btls/btls-x509-verify-param.h
@@ -10,8 +10,8 @@
 #define __btls__btls_x509_verify_param__
 
 #include <stdio.h>
-#include <btls-ssl.h>
-#include <btls-x509.h>
+#include "btls-ssl.h"
+#include "btls-x509.h"
 
 typedef enum {
 	MONO_BTLS_X509_VERIFY_FLAGS_DEFAULT		= 0,

diff --git a/mono/btls/btls-x509.c b/mono/btls/btls-x509.c
@@ -6,7 +6,7 @@
 //  Copyright (c) 2015 Xamarin. All rights reserved.
 //
 
-#include <btls-x509.h>
+#include "btls-x509.h"
 #include <openssl/x509v3.h>
 #include <openssl/pkcs12.h>
 

diff --git a/mono/btls/btls-x509.h b/mono/btls/btls-x509.h
@@ -10,8 +10,8 @@
 #define __btls__btls_x509__
 
 #include <stdio.h>
-#include <btls-ssl.h>
-#include <btls-x509-name.h>
+#include "btls-ssl.h"
+#include "btls-x509-name.h"
 
 typedef enum {
 	MONO_BTLS_X509_FORMAT_DER = 1,