From 4f7cf93dd0d9c37c7e5c6ec31d057f7cb3714a9c Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Mon, 24 Feb 2020 05:36:22 -0800 Subject: fixes #1205 Make include guards unique The nng.h header should use the same file path based guards as the rest of the headers, so NNG_NNG_H (as it is delivered as . --- extern/nng-wolfssl | 2 +- include/nng/nng.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/extern/nng-wolfssl b/extern/nng-wolfssl index 428fd4b7..288d545b 160000 --- a/extern/nng-wolfssl +++ b/extern/nng-wolfssl @@ -1 +1 @@ -Subproject commit 428fd4b740481745b57de8e5c84fb0e5ebabd509 +Subproject commit 288d545b92720e3fc38df400419a043cfadb840b diff --git a/include/nng/nng.h b/include/nng/nng.h index e061bd50..7cbc756d 100644 --- a/include/nng/nng.h +++ b/include/nng/nng.h @@ -8,8 +8,8 @@ // found online at https://opensource.org/licenses/MIT. // -#ifndef NNG_H -#define NNG_H +#ifndef NNG_NNG_H +#define NNG_NNG_H // NNG (nanomsg-next-gen) is an improved implementation of the SP protocols. // The APIs have changed, and there is no attempt to provide API compatibility @@ -1263,4 +1263,4 @@ NNG_DECL int nng_stream_listener_set_addr( } #endif -#endif // NNG_H +#endif // NNG_NNG_H -- cgit v1.2.3-70-g09d2