diff options
author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2015-03-24 00:09:45 +0100 |
---|---|---|
committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2015-03-24 00:09:45 +0100 |
commit | 9277fe13156a6ff2b055fe8a58d2863115c36b6a (patch) | |
tree | e18028ac10b9c1650a9d1e8f4f4789556c268b7d /libc/misc/utmp/wtent.c | |
parent | 63729418992d5f63965a88fa2ac3570e3d270479 (diff) |
Revert "utent.c, wtent.c: move functions from utxent.c"
This reverts commit 84135275cfeebc0b233c1c96eeada4d4178a0b18.
This change is said to make systemd deadlock (cannot reproduce this)
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Conflicts:
include/utmp.h
Diffstat (limited to 'libc/misc/utmp/wtent.c')
-rw-r--r-- | libc/misc/utmp/wtent.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/libc/misc/utmp/wtent.c b/libc/misc/utmp/wtent.c index 9b3ad5084..b5e4ee576 100644 --- a/libc/misc/utmp/wtent.c +++ b/libc/misc/utmp/wtent.c @@ -11,9 +11,6 @@ #include <time.h> #include <unistd.h> #include <utmp.h> -#ifdef __UCLIBC_HAS_UTMPX__ -# include <utmpx.h> -#endif #include <fcntl.h> #include <sys/file.h> #include <not-cancel.h> @@ -36,7 +33,7 @@ void logwtmp (const char *line, const char *name, const char *host) } #endif -static void __updwtmp(const char *wtmp_file, const struct utmp *lutmp) +void updwtmp(const char *wtmp_file, const struct utmp *lutmp) { int fd; @@ -49,11 +46,4 @@ static void __updwtmp(const char *wtmp_file, const struct utmp *lutmp) } } } -strong_alias(__updwtmp,updwtmp) - -#ifdef __UCLIBC_HAS_UTMPX__ -void updwtmpx (const char *wtmpx_file, const struct utmpx *utmpx) -{ - __updwtmp (wtmpx_file, (const struct utmp *) utmpx); -} -#endif +libc_hidden_def(updwtmp) |