Merge "fix compiler warning."

2013-02-14 17:48:30 +00:00
parent 6b97c7dc03 a261afb7c9
commit fe33fc790a
1 changed files with 1 additions and 1 deletions
--- a/libc/bionic/ssp.cpp
+++ b/libc/bionic/ssp.cpp
@@ -38,7 +38,7 @@
 #include "bionic_ssp.h"
 #include "logd.h"

-uintptr_t __stack_chk_guard = NULL;
+uintptr_t __stack_chk_guard = 0;

 static void __attribute__((constructor)) __init_stack_check_guard() {
  // AT_RANDOM is a pointer to 16 bytes of randomness on the stack.