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/core/defs.h | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) (limited to 'src/core/defs.h') diff --git a/src/core/defs.h b/src/core/defs.h index 1cfeeaa4..64a43a04 100644 --- a/src/core/defs.h +++ b/src/core/defs.h @@ -22,6 +22,8 @@ #define NNI_ARG_UNUSED(x) ((void) x) #ifndef NDEBUG +extern void nni_panic(const char *fmt, ...); + #define NNI_ASSERT(x) \ if (!(x)) \ nni_panic("%s: %d: assert err: %s", __FILE__, __LINE__, #x) @@ -125,30 +127,30 @@ typedef void (*nni_cb)(void *); // Modern CPUs are all little endian. Let's stop paying the endian tax. -#define NNI_PUT16LE(ptr, u) \ - do { \ - ((uint8_t *)ptr)[1] = (uint8_t) (((uint16_t) (u)) >> 8u); \ - ((uint8_t *)ptr)[0] = (uint8_t) ((uint16_t) (u)); \ +#define NNI_PUT16LE(ptr, u) \ + do { \ + ((uint8_t *) ptr)[1] = (uint8_t) (((uint16_t) (u)) >> 8u); \ + ((uint8_t *) ptr)[0] = (uint8_t) ((uint16_t) (u)); \ } while (0) -#define NNI_PUT32LE(ptr, u) \ - do { \ - ((uint8_t *)ptr)[3] = (uint8_t) (((uint32_t) (u)) >> 24u); \ - ((uint8_t *)ptr)[2] = (uint8_t) (((uint32_t) (u)) >> 16u); \ - ((uint8_t *)ptr)[1] = (uint8_t) (((uint32_t) (u)) >> 8u); \ - ((uint8_t *)ptr)[0] = (uint8_t) ((uint32_t) (u)); \ +#define NNI_PUT32LE(ptr, u) \ + do { \ + ((uint8_t *) ptr)[3] = (uint8_t) (((uint32_t) (u)) >> 24u); \ + ((uint8_t *) ptr)[2] = (uint8_t) (((uint32_t) (u)) >> 16u); \ + ((uint8_t *) ptr)[1] = (uint8_t) (((uint32_t) (u)) >> 8u); \ + ((uint8_t *) ptr)[0] = (uint8_t) ((uint32_t) (u)); \ } while (0) -#define NNI_PUT64LE(ptr, u) \ - do { \ - ((uint8_t *)ptr)[7] = (uint8_t) (((uint64_t) (u)) >> 56u); \ - ((uint8_t *)ptr)[6] = (uint8_t) (((uint64_t) (u)) >> 48u); \ - ((uint8_t *)ptr)[5] = (uint8_t) (((uint64_t) (u)) >> 40u); \ - ((uint8_t *)ptr)[4] = (uint8_t) (((uint64_t) (u)) >> 32u); \ - ((uint8_t *)ptr)[3] = (uint8_t) (((uint64_t) (u)) >> 24u); \ - ((uint8_t *)ptr)[2] = (uint8_t) (((uint64_t) (u)) >> 16u); \ - ((uint8_t *)ptr)[1] = (uint8_t) (((uint64_t) (u)) >> 8u); \ - ((uint8_t *)ptr)[0] = (uint8_t) ((uint64_t) (u)); \ +#define NNI_PUT64LE(ptr, u) \ + do { \ + ((uint8_t *) ptr)[7] = (uint8_t) (((uint64_t) (u)) >> 56u); \ + ((uint8_t *) ptr)[6] = (uint8_t) (((uint64_t) (u)) >> 48u); \ + ((uint8_t *) ptr)[5] = (uint8_t) (((uint64_t) (u)) >> 40u); \ + ((uint8_t *) ptr)[4] = (uint8_t) (((uint64_t) (u)) >> 32u); \ + ((uint8_t *) ptr)[3] = (uint8_t) (((uint64_t) (u)) >> 24u); \ + ((uint8_t *) ptr)[2] = (uint8_t) (((uint64_t) (u)) >> 16u); \ + ((uint8_t *) ptr)[1] = (uint8_t) (((uint64_t) (u)) >> 8u); \ + ((uint8_t *) ptr)[0] = (uint8_t) ((uint64_t) (u)); \ } while (0) #define NNI_GET16LE(ptr, v) \ -- cgit v1.2.3-70-g09d2