From 5e91c3b5d1a70f7af2e04ac74d98ae6b407f169c Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Mon, 2 Jul 2012 01:56:35 -0400 Subject: [PATCH] Windows: export roken allocators Use rk_alloc, rk_calloc, rk_free, rk_realloc instead of Windows C RTL allocators. The OpenAFS source tree has a bad habit of allocating memory in one module and freeing it in another. This is not a problem for POSIX but is disaster on Windows. This change ensures that all OpenAFS modules share the same allocator. Change-Id: Ia57f1ba351e8dc24e7fbba87bbc9595bcf001ed6 Reviewed-on: http://gerrit.openafs.org/7625 Tested-by: BuildBot Reviewed-by: Jeffrey Altman --- src/roken/NTMakefile | 4 +++- src/roken/afsroken.def | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/roken/NTMakefile b/src/roken/NTMakefile index 591ad8987..cace20822 100644 --- a/src/roken/NTMakefile +++ b/src/roken/NTMakefile @@ -43,6 +43,7 @@ ROKEN_OBJS = \ $(OUT)\mkstemp.obj \ $(OUT)\net_read.obj \ $(OUT)\net_write.obj \ + $(OUT)\realloc.obj \ $(OUT)\setprogname.obj \ $(OUT)\snprintf.obj \ $(OUT)\socket.obj \ @@ -58,7 +59,8 @@ ROKEN_OBJS = \ $(OUT)\vwarnx.obj \ $(OUT)\warn.obj \ $(OUT)\warnerr.obj \ - $(OUT)\warnx.obj + $(OUT)\warnx.obj \ + $(OUT)\win32_alloc.obj $(ROKEN_OBJS):$(ROKEN)\$$(@B).c $(C2OBJ) $** -I$(ROKEN) diff --git a/src/roken/afsroken.def b/src/roken/afsroken.def index 6f717516e..efb2bbf97 100644 --- a/src/roken/afsroken.def +++ b/src/roken/afsroken.def @@ -42,3 +42,7 @@ EXPORTS rk_tfind @46 rk_getprogname @47 rk_setprogname @48 + rk_calloc @49 + rk_free @50 + rk_malloc @51 + rk_realloc @52 -- 2.39.5