diff options
| author | Chris Want <cwant@ualberta.ca> | 2005-11-17 17:48:11 +0300 |
|---|---|---|
| committer | Chris Want <cwant@ualberta.ca> | 2005-11-17 17:48:11 +0300 |
| commit | b44ba190d2626ddc43b754a896426fd5c5f04000 (patch) | |
| tree | fb6edae94770fc11c818623680782a74ccb26bcd /intern | |
| parent | f0593ea8e8daa7f1e8f3b25f240cda020025698c (diff) | |
Fix for bug #3414 provided by Lewis Saunders.
It appears that removing the 'int level' field from the
MemHead struct caused alignment issues for gcc builds of blender
on Irix (zr, who removed this field, commented that this problem
might occur, and sure enough it did happen). I've renamed the
field from 'level' to 'pad' to reflect that it has no meaning
beyond addressing alignment issues.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/guardedalloc/intern/mallocn.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/guardedalloc/intern/mallocn.c b/intern/guardedalloc/intern/mallocn.c index cae1e3f05b5..cd1917cd3c7 100644 --- a/intern/guardedalloc/intern/mallocn.c +++ b/intern/guardedalloc/intern/mallocn.c @@ -66,8 +66,8 @@ typedef struct MemHead { struct MemHead *next,*prev; char * name; char * nextname; - /* int level; */ /* historical, can be removed, but check alignment issues - zr */ int tag2; + int pad; /* keep this in, due to alignment issues (e.g., irix/gcc) - Hos */ } MemHead; typedef struct MemTail { |