| commit | fe33fc790a16d85ce4109a4575d6fdcd88d42023 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Thu Feb 14 17:48:30 2013 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Feb 14 17:48:30 2013 +0000 |
| tree | 6febba1dc5464e2ab17e47a6473d314b50337cfb | |
| parent | 6b97c7dc0376577276abbdacc52e5cc11cf8a7fd [diff] | |
| parent | a261afb7c9de7c59dd078fa88f40b7818f79a098 [diff] |
Merge "fix compiler warning."
diff --git a/libc/bionic/ssp.cpp b/libc/bionic/ssp.cpp index f01fee6..3b7a1ff 100644 --- 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.