Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
3db09928
Commit
3db09928
authored
12 years ago
by
David Parks
Browse files
Options
Downloads
Patches
Plain Diff
MAINT-1503 Fix for linux build
parent
1b89f373
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
indra/llcommon/llmemory.h
+11
-11
11 additions, 11 deletions
indra/llcommon/llmemory.h
with
11 additions
and
11 deletions
indra/llcommon/llmemory.h
+
11
−
11
View file @
3db09928
...
...
@@ -61,6 +61,17 @@ inline void* ll_aligned_malloc_16(size_t size) // returned hunk MUST be freed wi
#endif
}
inline
void
ll_aligned_free_16
(
void
*
p
)
{
#if defined(LL_WINDOWS)
_aligned_free
(
p
);
#elif defined(LL_DARWIN)
return
free
(
p
);
#else
free
(
p
);
// posix_memalign() is compatible with heap deallocator
#endif
}
inline
void
*
ll_aligned_realloc_16
(
void
*
ptr
,
size_t
size
,
size_t
old_size
)
// returned hunk MUST be freed with ll_aligned_free_16().
{
#if defined(LL_WINDOWS)
...
...
@@ -75,17 +86,6 @@ inline void* ll_aligned_realloc_16(void* ptr, size_t size, size_t old_size) // r
return
ret
;
#endif
}
inline
void
ll_aligned_free_16
(
void
*
p
)
{
#if defined(LL_WINDOWS)
_aligned_free
(
p
);
#elif defined(LL_DARWIN)
return
free
(
p
);
#else
free
(
p
);
// posix_memalign() is compatible with heap deallocator
#endif
}
#else // USE_TCMALLOC
// ll_aligned_foo_16 are not needed with tcmalloc
#define ll_aligned_malloc_16 malloc
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment