diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-06-20 18:15:36 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-06-20 18:15:36 -0700 |
| commit | c3ed656997ea4515d846debf45121af1bd174a51 (patch) | |
| tree | de84436eba40aedf96ca8c091c743e0d7d79e965 /system/lib | |
| parent | 0ad87244178badf26cd5c8e0ed88116e87026472 (diff) | |
| parent | 97d19be7f46bb3b0862e575fc6e06abafca74df7 (diff) | |
Merge branch 'incoming'
Diffstat (limited to 'system/lib')
| -rw-r--r-- | system/lib/libc.symbols | 2 | ||||
| -rw-r--r-- | system/lib/libc/gen/warn.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/system/lib/libc.symbols b/system/lib/libc.symbols index 70b21024..561f01c1 100644 --- a/system/lib/libc.symbols +++ b/system/lib/libc.symbols @@ -77,5 +77,5 @@ W verrx W vwarn W vwarnx - W warn1 + W warn W warnx diff --git a/system/lib/libc/gen/warn.c b/system/lib/libc/gen/warn.c index c0803ab9..c0dd2cd7 100644 --- a/system/lib/libc/gen/warn.c +++ b/system/lib/libc/gen/warn.c @@ -46,4 +46,4 @@ _warn(const char *fmt, ...) /* PRINTFLIKE1 */ void -warn(const char *fmt, ...) __attribute__((weak, alias("warn"))); +warn(const char *fmt, ...) __attribute__((weak, alias("_warn"))); |