Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
tor
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Terraform modules
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
jarl
tor
Commits
7babf332
Commit
7babf332
authored
9 years ago
by
Nick Mathewson
Browse files
Options
Downloads
Plain Diff
Merge remote-tracking branch 'public/bug18716_027' into maint-0.2.8
parents
40827da3
39c057d4
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
changes/bug18716
+4
-0
4 additions, 0 deletions
changes/bug18716
src/common/memarea.c
+2
-2
2 additions, 2 deletions
src/common/memarea.c
with
6 additions
and
2 deletions
changes/bug18716
0 → 100644
+
4
−
0
View file @
7babf332
o Minor bugfixes (assert, portability):
- Fix an assertion failure in memarea.c on systems where "long" is
shorter than the size of a pointer.
Fixes bug 18716; bugfix on 0.2.1.1-alpha
This diff is collapsed.
Click to expand it.
src/common/memarea.c
+
2
−
2
View file @
7babf332
...
...
@@ -24,9 +24,9 @@
/** A value which, when masked out of a pointer, produces a maximally aligned
* pointer. */
#if MEMAREA_ALIGN == 4
#define MEMAREA_ALIGN_MASK
3lu
#define MEMAREA_ALIGN_MASK
((uintptr_t)3)
#elif MEMAREA_ALIGN == 8
#define MEMAREA_ALIGN_MASK
7lu
#define MEMAREA_ALIGN_MASK
((uintptr_t)7)
#else
#error "void* is neither 4 nor 8 bytes long. I don't know how to align stuff."
#endif
...
...
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