瀏覽代碼

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
Szabolcs Nagy 10 年之前
父節點
當前提交
d86af2a080
共有 1 個文件被更改,包括 3 次插入4 次删除
  1. 3 4
      src/env/__init_tls.c

+ 3 - 4
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,