summaryrefslogtreecommitdiff
path: root/libc/misc
diff options
context:
space:
mode:
Diffstat (limited to 'libc/misc')
-rw-r--r--libc/misc/internals/__uClibc_main.c3
-rw-r--r--libc/misc/time/time.c8
2 files changed, 6 insertions, 5 deletions
diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c
index 32071c50c..73aafa18b 100644
--- a/libc/misc/internals/__uClibc_main.c
+++ b/libc/misc/internals/__uClibc_main.c
@@ -57,6 +57,7 @@ void *__libc_stack_end=NULL;
/* Only exported for architectures that don't store the stack guard canary
* in thread local area. */
#include <stdint.h>
+uintptr_t stack_chk_guard;
/* for gcc-4.1 non-TLS */
uintptr_t __stack_chk_guard attribute_relro;
/* for gcc-3.x + Etoh ssp */
@@ -186,7 +187,7 @@ void __uClibc_init(void)
#ifndef SHARED
# ifdef __UCLIBC_HAS_SSP__
/* Set up the stack checker's canary. */
- uintptr_t stack_chk_guard = _dl_setup_stack_chk_guard();
+ stack_chk_guard = _dl_setup_stack_chk_guard();
# ifdef THREAD_SET_STACK_GUARD
THREAD_SET_STACK_GUARD (stack_chk_guard);
# else
diff --git a/libc/misc/time/time.c b/libc/misc/time/time.c
index b6dce44ea..84f201d44 100644
--- a/libc/misc/time/time.c
+++ b/libc/misc/time/time.c
@@ -475,21 +475,21 @@ clock_t clock(void)
/**********************************************************************/
#ifdef L_ctime
-char *ctime(const time_t *clock)
+char *ctime(const time_t *t)
{
/* ANSI/ISO/SUSv3 say that ctime is equivalent to the following. */
- return asctime(localtime(clock));
+ return asctime(localtime(t));
}
libc_hidden_def(ctime)
#endif
/**********************************************************************/
#ifdef L_ctime_r
-char *ctime_r(const time_t *clock, char *buf)
+char *ctime_r(const time_t *t, char *buf)
{
struct tm xtm;
- return asctime_r(localtime_r(clock, &xtm), buf);
+ return asctime_r(localtime_r(t, &xtm), buf);
}
#endif