Various header file fixes... also fix compilation errors when HTTP is disabled.v2.0.0-alpha.6

Also, some instances nni_aio are changed to nng_aio.  We think we want to harmonize
some of these types going forward as it will reduce the need to include headers
hopefully letting us get away with just "defs.h" in more places.

3 files changed, 12 insertions, 11 deletions

diff --git a/src/sp/transport/dtls/dtls_tran_test.c b/src/sp/transport/dtls/dtls_tran_test.c
index e31b7909..774c967a 100644
--- a/src/sp/transport/dtls/dtls_tran_test.c
+++ b/src/sp/transport/dtls/dtls_tran_test.c
@@ -11,7 +11,8 @@
 //
 
 #include "nng/nng.h"
-#include <nuts.h>
+
+#include "../../../testing/nuts.h"
 
 // TLS tests.
 
diff --git a/src/sp/transport/tls/tls.c b/src/sp/transport/tls/tls.c
index fd983c67..0bd4c284 100644
--- a/src/sp/transport/tls/tls.c
+++ b/src/sp/transport/tls/tls.c
@@ -12,7 +12,7 @@
 #include <stdbool.h>
 #include <string.h>
 
-#include "core/nng_impl.h"
+#include "../../../core/nng_impl.h"
 
 #include "nng/nng.h"
 
@@ -43,9 +43,9 @@ struct tlstran_pipe {
 	size_t        gotrxhead;
 	size_t        wanttxhead;
 	size_t        wantrxhead;
-	nni_aio       txaio;
-	nni_aio       rxaio;
-	nni_aio       negoaio;
+	nng_aio       txaio;
+	nng_aio       rxaio;
+	nng_aio       negoaio;
 	nni_msg      *rxmsg;
 	nni_mtx       mtx;
 };
@@ -63,9 +63,9 @@ struct tlstran_ep {
 	nng_stream_listener *listener;
 	nni_dialer          *ndialer;
 	nni_listener        *nlistener;
-	nni_aio             *useraio;
-	nni_aio              connaio;
-	nni_aio              timeaio;
+	nng_aio             *useraio;
+	nng_aio              connaio;
+	nng_aio              timeaio;
 	nni_list             waitpipes; // pipes waiting to match to socket
 	nni_list             negopipes; // pipes busy negotiating
 	const char          *host;
diff --git a/src/sp/transport/tls/tls_tran_test.c b/src/sp/transport/tls/tls_tran_test.c
index 8f541e68..73c299c8 100644
--- a/src/sp/transport/tls/tls_tran_test.c
+++ b/src/sp/transport/tls/tls_tran_test.c
@@ -11,7 +11,8 @@
 //
 
 #include "nng/nng.h"
-#include <nuts.h>
+
+#include "../../../testing/nuts.h"
 
 // TLS tests.
 
@@ -226,8 +227,7 @@ test_tls_pipe_details(void)
 	p = nng_msg_get_pipe(msg);
 	NUTS_TRUE(nng_pipe_id(p) >= 0);
 #if !defined(NNG_TLS_ENGINE_WOLFSSL) || defined(NNG_WOLFSSL_HAVE_PEER_CERT)
-	char  *cn;
-	char **alts;
+	char *cn;
 	NUTS_PASS(nng_pipe_get_string(p, NNG_OPT_TLS_PEER_CN, &cn));
 	NUTS_ASSERT(cn != NULL);
 	NUTS_MATCH(cn, "127.0.0.1");