X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=include%2Futmpx.h;h=b293f427e6b0d5acbf0f870110e326b2f7ff8d2f;hb=25085c85a0055a94919bf522c96803db7c885431;hp=fd5f515a10ff599e9f60fbbae3913a74c9c003a7;hpb=9448b0513e2eec020fbca9c10412b83df5027a16;p=musl

diff --git a/include/utmpx.h b/include/utmpx.h
index fd5f515a..b293f427 100644
--- a/include/utmpx.h
+++ b/include/utmpx.h
@@ -5,6 +5,8 @@
 extern "C" {
 #endif
 
+#include <features.h>
+
 #define __NEED_pid_t
 #define __NEED_time_t
 #define __NEED_suseconds_t
@@ -12,21 +14,23 @@ extern "C" {
 
 #include <bits/alltypes.h>
 
-#define UT_LINESIZE 32
-
-struct utmpx
-{
+struct utmpx {
 	short ut_type;
+	short __ut_pad1;
 	pid_t ut_pid;
-	char ut_line[UT_LINESIZE];
+	char ut_line[32];
 	char ut_id[4];
 	char ut_user[32];
 	char ut_host[256];
 	struct {
-		short e_termination;
-		short e_exit;
+		short __e_termination;
+		short __e_exit;
 	} ut_exit;
-	long ut_session;
+#if __BYTE_ORDER == 1234
+	int ut_session, __ut_pad2;
+#else
+	int __ut_pad2, ut_session;
+#endif
 	struct timeval ut_tv;
 	unsigned ut_addr_v6[4];
 	char __unused[20];
@@ -39,7 +43,12 @@ struct utmpx *getutxline(const struct utmpx *);
 struct utmpx *pututxline(const struct utmpx *);
 void          setutxent(void);
 
+#if defined(_BSD_SOURCE) || defined(_GNU_SOURCE)
+#define e_exit __e_exit
+#define e_termination __e_termination
 void updwtmpx(const char *, const struct utmpx *);
+int utmpxname(const char *);
+#endif
 
 #define EMPTY           0
 #define RUN_LVL         1