[compiler-rt] r200536 - Fix compilation: don't convert NULL to a pointer-incompatible type.

[Alexander Potapenko]

Author: glider
Date: Fri Jan 31 05:44:15 2014
New Revision: 200536

URL: http://llvm.org/viewvc/llvm-project?rev=200536&view=rev
Log:
Fix compilation: don't convert NULL to a pointer-incompatible type.

Modified:
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc

Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc?rev=200536&r1=200535&r2=200536&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc Fri Jan 31 05:44:15 2014
@@ -428,8 +428,8 @@ int internal_sigaction_norestorer(int si
   }
 
   uptr result = internal_syscall(__NR_rt_sigaction, (uptr)signum,
-      (uptr)(u_act ? &k_act : (uptr)NULL),
-      (uptr)(u_oldact ? &k_oldact : (uptr)NULL),
+      (uptr)(u_act ? &k_act : NULL),
+      (uptr)(u_oldact ? &k_oldact : NULL),
       (uptr)sizeof(__sanitizer_kernel_sigset_t));
 
   if ((result == 0) && u_oldact) {