From 6493faf5299cb27a632213d3b44c234bb9b52963 Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Thu, 30 May 2019 23:17:50 -0400 Subject: [PATCH] Ah, figured it out. Now to separate these out into a separate header file. --- sharedbits/alloc_header.h | 4 ++-- sharedbits/alloc_impl.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sharedbits/alloc_header.h b/sharedbits/alloc_header.h index 0b44d29d..0caab3ce 100644 --- a/sharedbits/alloc_header.h +++ b/sharedbits/alloc_header.h @@ -4,8 +4,8 @@ #error you must define sharedbitsPrefix before including this #endif #define sharedbitsPrefixMakeName(x, y) x ## y -#define sharedbitsPrefixExpand(x) x -#define sharedbitsPrefixName(Name) sharedbitsPrefixMakeName(sharedbitsPrefixExpand(sharedbitsPrefix), Name) +#define sharedbitsPrefixExpandMakeName(x, y) sharedbitsPrefixMakeName(x, y) +#define sharedbitsPrefixName(Name) sharedbitsPrefixExpandMakeName(sharedbitsPrefix, Name) extern void *sharedbitsPrefixName(Alloc)(size_t n, const char *what); extern void *sharedbitsPrefixName(Realloc)(void *p, size_t nOld, size_t nNew, const char *what); diff --git a/sharedbits/alloc_impl.h b/sharedbits/alloc_impl.h index 93e5979c..6f29488c 100644 --- a/sharedbits/alloc_impl.h +++ b/sharedbits/alloc_impl.h @@ -5,8 +5,8 @@ #error you must define sharedbitsPrefix before including this #endif #define sharedbitsPrefixMakeName(x, y) x ## y -#define sharedbitsPrefixExpand(x) x -#define sharedbitsPrefixName(Name) sharedbitsPrefixMakeName(sharedbitsPrefixExpand(sharedbitsPrefix), Name) +#define sharedbitsPrefixExpandMakeName(x, y) sharedbitsPrefixMakeName(x, y) +#define sharedbitsPrefixName(Name) sharedbitsPrefixExpandMakeName(sharedbitsPrefix, Name) extern void sharedbitsPrefixName(InternalError)(const char *fmt, ...);