Browse Source

fix #ifdef inside a macro argument list in __init_tls.c

C99 6.10.3p11 disallows such constructs
so use an #ifdef outside of the argument list of __syscall
master
Szabolcs Nagy 12 years ago
parent
commit
d86af2a080
  1. 7
      src/env/__init_tls.c

7
src/env/__init_tls.c

@ -91,12 +91,11 @@ void __init_tls(size_t *aux)
libc.tls_size = 2*sizeof(void *)+T.size+T.align+sizeof(struct pthread);
if (libc.tls_size > sizeof builtin_tls) {
#ifndef SYS_mmap2
#define SYS_mmap2 SYS_mmap
#endif
mem = (void *)__syscall(
#ifdef SYS_mmap2
SYS_mmap2,
#else
SYS_mmap,
#endif
0, libc.tls_size, PROT_READ|PROT_WRITE,
MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
/* -4095...-1 cast to void * will crash on dereference anyway,

Loading…
Cancel
Save