From 63aea267bca92461ff719186aa53811d60127935 Mon Sep 17 00:00:00 2001
From: Michael Jerris <mike@jerris.com>
Date: Fri, 21 Feb 2014 15:25:50 -0500
Subject: [PATCH] change macro name to work around conflict in openbsd
---
libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c b/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c
index ec3d1a2f99..005989bb75 100644
--- a/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c
+++ b/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c
@@ -238,7 +238,7 @@ enum {
};
#define ALIGNMENT (8)
-#define _ALIGN(n) (size_t)(((n) + (ALIGNMENT - 1)) & (size_t)~(ALIGNMENT - 1))
+#define __ALIGN(n) (size_t)(((n) + (ALIGNMENT - 1)) & (size_t)~(ALIGNMENT - 1))
#define SIZEBITS (sizeof (unsigned) * 8 - 1)
typedef struct {
@@ -478,7 +478,7 @@ void *sub_alloc(su_home_t *home,
sub->sub_preload && size <= sub->sub_prsize) {
/* Use preloaded memory */
size_t prused = sub->sub_prused + size + MEMCHECK_EXTRA;
- prused = _ALIGN(prused);
+ prused = __ALIGN(prused);
if (prused <= sub->sub_prsize) {
preload = (char *)sub->sub_preload + sub->sub_prused;
sub->sub_prused = (unsigned)prused;
@@ -1313,7 +1313,7 @@ void su_home_preload(su_home_t *home, isize_t n, isize_t isize)
size_t size;
void *preload;
- size = n * _ALIGN(isize);
+ size = n * __ALIGN(isize);
if (size > 65535) /* We have 16 bits... */
size = 65535 & (ALIGNMENT - 1);
@@ -1334,13 +1334,13 @@ su_home_t *su_home_auto(void *area, isize_t size)
{
su_home_t *home;
su_block_t *sub;
- size_t homesize = _ALIGN(sizeof *home);
- size_t subsize = _ALIGN(offsetof(su_block_t, sub_nodes[SUB_N_AUTO]));
+ size_t homesize = __ALIGN(sizeof *home);
+ size_t subsize = __ALIGN(offsetof(su_block_t, sub_nodes[SUB_N_AUTO]));
size_t prepsize;
char *p = area;
- prepsize = homesize + subsize + (_ALIGN((intptr_t)p) - (intptr_t)p);
+ prepsize = homesize + subsize + (__ALIGN((intptr_t)p) - (intptr_t)p);
if (area == NULL || size < prepsize)
return NULL;
@@ -1443,11 +1443,11 @@ void *su_realloc(su_home_t *home, void *data, isize_t size)
p = (char *)data - home->suh_blocks->sub_preload;
p += sua->sua_size + MEMCHECK_EXTRA;
- p = _ALIGN(p);
+ p = __ALIGN(p);
if (p == sub->sub_prused) {
size_t p2 = (char *)data - sub->sub_preload + size + MEMCHECK_EXTRA;
- p2 = _ALIGN(p2);
+ p2 = __ALIGN(p2);
if (p2 <= sub->sub_prsize) {
/* Extend/reduce existing preload */
if (sub->sub_stats) {
@@ -1840,7 +1840,7 @@ void su_home_stats_alloc(su_block_t *sub, void *p, void *preload,
{
su_home_stat_t *hs = sub->sub_stats;
- size_t rsize = _ALIGN(size);
+ size_t rsize = __ALIGN(size);
hs->hs_rehash += (sub->sub_n != hs->hs_blocksize);
hs->hs_blocksize = sub->sub_n;
@@ -1869,7 +1869,7 @@ void su_home_stats_free(su_block_t *sub, void *p, void *preload,
{
su_home_stat_t *hs = sub->sub_stats;
- size_t rsize = _ALIGN(size);
+ size_t rsize = __ALIGN(size);
if (preload) {
hs->hs_frees.hsf_preload++;