From d1bd64c8251171ac8e1d4e71ab8726c2a64fd55a Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Sun, 5 Oct 2025 08:25:50 -0700 Subject: Various header file fixes... also fix compilation errors when HTTP is disabled. 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. --- src/supplemental/websocket/sha1.h | 2 +- src/supplemental/websocket/websocket.c | 4 ++-- src/supplemental/websocket/websocket.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/supplemental/websocket') diff --git a/src/supplemental/websocket/sha1.h b/src/supplemental/websocket/sha1.h index b061e884..1e666977 100644 --- a/src/supplemental/websocket/sha1.h +++ b/src/supplemental/websocket/sha1.h @@ -11,7 +11,7 @@ #ifndef NNG_SUPPLEMENTAL_WEBSOCKET_SHA1_H #define NNG_SUPPLEMENTAL_WEBSOCKET_SHA1_H -#include "core/defs.h" +#include "../../core/defs.h" typedef struct { uint32_t digest[5]; // resulting digest diff --git a/src/supplemental/websocket/websocket.c b/src/supplemental/websocket/websocket.c index 4ddf8918..597efb76 100644 --- a/src/supplemental/websocket/websocket.c +++ b/src/supplemental/websocket/websocket.c @@ -13,9 +13,9 @@ #include #include -#include "core/nng_impl.h" +#include "../../core/nng_impl.h" +#include "../../supplemental/http/http_api.h" #include "nng/http.h" -#include "supplemental/http/http_api.h" #include "base64.h" #include "sha1.h" diff --git a/src/supplemental/websocket/websocket.h b/src/supplemental/websocket/websocket.h index 0fa045d5..70652923 100644 --- a/src/supplemental/websocket/websocket.h +++ b/src/supplemental/websocket/websocket.h @@ -14,7 +14,7 @@ #include -#include "core/stream.h" +#include "../../core/stream.h" typedef struct nni_ws nni_ws; typedef struct nni_ws_listener nni_ws_listener; -- cgit v1.2.3-70-g09d2