nng_aio_finish should take nng_err rather than int

3 files changed, 3 insertions, 4 deletions

diff --git a/include/nng/nng.h b/include/nng/nng.h
index c2c8125c..afb347de 100644
--- a/include/nng/nng.h
+++ b/include/nng/nng.h
@@ -692,7 +692,7 @@ NNG_DECL void nng_aio_reset(nng_aio *);
 // The argument is the value that nng_aio_result() should return.
 // IMPORTANT: Callers must ensure that this is called EXACTLY ONCE on any
 // given aio.
-NNG_DECL void nng_aio_finish(nng_aio *, int);
+NNG_DECL void nng_aio_finish(nng_aio *, nng_err);
 
 // nng_aio_start is used to register a cancellation routine, and indicate
 // that the operation will be completed asynchronously.  It must only be
diff --git a/src/core/nng_impl.h b/src/core/nng_impl.h
index ef15ee45..0fd33fbd 100644
--- a/src/core/nng_impl.h
+++ b/src/core/nng_impl.h
@@ -10,7 +10,7 @@
 #ifndef CORE_NNG_IMPL_H
 #define CORE_NNG_IMPL_H
 
-#include "nng/nng.h"
+#include "../../include/nng/nng.h"
 
 // Internal implementation things for NNG, common definitions, etc.
 // All internal modules wind up including this file to avoid having
diff --git a/src/nng.c b/src/nng.c
index 423ddb64..acbfd1b5 100644
--- a/src/nng.c
+++ b/src/nng.c
@@ -8,7 +8,6 @@
 // found online at https://opensource.org/licenses/MIT.
 //
 
-#include "nng/nng.h"
 #include "core/nng_impl.h"
 #include "core/platform.h"
 #include "core/socket.h"
@@ -2061,7 +2060,7 @@ nng_aio_get_output(nng_aio *aio, unsigned index)
 }
 
 void
-nng_aio_finish(nng_aio *aio, int rv)
+nng_aio_finish(nng_aio *aio, nng_err rv)
 {
 	// Preserve the count.
 	nni_aio_finish(aio, rv, nni_aio_count(aio));