From 9c8779c150a54fb040ef748cc8b05f0246356c83 Mon Sep 17 00:00:00 2001
From: Marty Kraimer <mrkraimer@comcast.net>
Date: Tue, 20 Jan 1998 21:39:28 +0000
Subject: [PATCH] Changes for 64 bit architectures

---
 src/libCom/freeList/freeListLib.c | 6 ++++--
 src/libCom/freeListLib.c          | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/libCom/freeList/freeListLib.c b/src/libCom/freeList/freeListLib.c
index 87478132e..1ec1d4e58 100644
--- a/src/libCom/freeList/freeListLib.c
+++ b/src/libCom/freeList/freeListLib.c
@@ -64,6 +64,7 @@ DEVELOPMENT CENTER AT ARGONNE NATIONAL LABORATORY (708-252-2000).
 
 #define epicsExportSharedSymbols
 #include "freeList.h"
+#include "adjustment.h"
 
 typedef struct allocMem {
     struct allocMem	*next;
@@ -84,6 +85,7 @@ epicsShareFunc void epicsShareAPI
 	freeListInitPvt(void **ppvt,int size,int nmalloc)
 {
     FREELISTPVT	*pfl;
+
     pfl = (void *)calloc((size_t)1,(size_t)sizeof(FREELISTPVT));
     if(!pfl) {
 #ifdef vxWorks
@@ -92,7 +94,7 @@ epicsShareFunc void epicsShareAPI
 	abort();
 #endif
     }
-    pfl->size = size;
+    pfl->size = adjustToWorstCaseAlignment(size);
     pfl->nmalloc = nmalloc;
     pfl->head = NULL;
     pfl->mallochead = NULL;
@@ -127,7 +129,7 @@ epicsShareFunc void * epicsShareAPI freeListMalloc(void *pvt)
 #endif
     ptemp = pfl->head;
     if(!ptemp) {
-	ptemp = (void *)malloc((pfl->nmalloc*pfl->size)+sizeof(void *));
+	ptemp = (void *)malloc(pfl->nmalloc*pfl->size);
 	pallocmem = (allocMem *)calloc(1,sizeof(allocMem));
 	if(!ptemp || !pallocmem) {
 #ifdef vxWorks
diff --git a/src/libCom/freeListLib.c b/src/libCom/freeListLib.c
index 87478132e..1ec1d4e58 100644
--- a/src/libCom/freeListLib.c
+++ b/src/libCom/freeListLib.c
@@ -64,6 +64,7 @@ DEVELOPMENT CENTER AT ARGONNE NATIONAL LABORATORY (708-252-2000).
 
 #define epicsExportSharedSymbols
 #include "freeList.h"
+#include "adjustment.h"
 
 typedef struct allocMem {
     struct allocMem	*next;
@@ -84,6 +85,7 @@ epicsShareFunc void epicsShareAPI
 	freeListInitPvt(void **ppvt,int size,int nmalloc)
 {
     FREELISTPVT	*pfl;
+
     pfl = (void *)calloc((size_t)1,(size_t)sizeof(FREELISTPVT));
     if(!pfl) {
 #ifdef vxWorks
@@ -92,7 +94,7 @@ epicsShareFunc void epicsShareAPI
 	abort();
 #endif
     }
-    pfl->size = size;
+    pfl->size = adjustToWorstCaseAlignment(size);
     pfl->nmalloc = nmalloc;
     pfl->head = NULL;
     pfl->mallochead = NULL;
@@ -127,7 +129,7 @@ epicsShareFunc void * epicsShareAPI freeListMalloc(void *pvt)
 #endif
     ptemp = pfl->head;
     if(!ptemp) {
-	ptemp = (void *)malloc((pfl->nmalloc*pfl->size)+sizeof(void *));
+	ptemp = (void *)malloc(pfl->nmalloc*pfl->size);
 	pallocmem = (allocMem *)calloc(1,sizeof(allocMem));
 	if(!ptemp || !pallocmem) {
 #ifdef vxWorks