Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
85cadafa
Unverified
Commit
85cadafa
authored
Feb 11, 2019
by
Salvatore Sanfilippo
Committed by
GitHub
Feb 11, 2019
Browse files
Merge pull request #5831 from lamby/x32-warnings
Don't assume the __x86_64__ pointer size to avoid warnings on x32
parents
df346bca
d0089cf2
Changes
1
Show whitespace changes
Inline
Side-by-side
src/debug.c
View file @
85cadafa
...
@@ -803,7 +803,7 @@ static void *getMcontextEip(ucontext_t *uc) {
...
@@ -803,7 +803,7 @@ static void *getMcontextEip(ucontext_t *uc) {
#endif
#endif
#elif defined(__linux__)
#elif defined(__linux__)
/* Linux */
/* Linux */
#if defined(__i386__)
#if defined(__i386__)
|| defined(__ILP32__)
return
(
void
*
)
uc
->
uc_mcontext
.
gregs
[
14
];
/* Linux 32 */
return
(
void
*
)
uc
->
uc_mcontext
.
gregs
[
14
];
/* Linux 32 */
#elif defined(__X86_64__) || defined(__x86_64__)
#elif defined(__X86_64__) || defined(__x86_64__)
return
(
void
*
)
uc
->
uc_mcontext
.
gregs
[
16
];
/* Linux 64 */
return
(
void
*
)
uc
->
uc_mcontext
.
gregs
[
16
];
/* Linux 64 */
...
@@ -915,7 +915,7 @@ void logRegisters(ucontext_t *uc) {
...
@@ -915,7 +915,7 @@ void logRegisters(ucontext_t *uc) {
/* Linux */
/* Linux */
#elif defined(__linux__)
#elif defined(__linux__)
/* Linux x86 */
/* Linux x86 */
#if defined(__i386__)
#if defined(__i386__)
|| defined(__ILP32__)
serverLog
(
LL_WARNING
,
serverLog
(
LL_WARNING
,
"
\n
"
"
\n
"
"EAX:%08lx EBX:%08lx ECX:%08lx EDX:%08lx
\n
"
"EAX:%08lx EBX:%08lx ECX:%08lx EDX:%08lx
\n
"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment