X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=include%2Futmpx.h;h=b293f427e6b0d5acbf0f870110e326b2f7ff8d2f;hb=8c0c9c69a12acc0a82590d4fd64cf633ff1dedd2;hp=9e5cc955eb1f89c3abc9b8fd2384ea981aa1ae71;hpb=befa5866ee30d09c0c96e88af2eabff5911342ea;p=musl

diff --git a/include/utmpx.h b/include/utmpx.h
index 9e5cc955..b293f427 100644
--- a/include/utmpx.h
+++ b/include/utmpx.h
@@ -16,6 +16,7 @@ extern "C" {
 
 struct utmpx {
 	short ut_type;
+	short __ut_pad1;
 	pid_t ut_pid;
 	char ut_line[32];
 	char ut_id[4];
@@ -25,7 +26,11 @@ struct utmpx {
 		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];
@@ -38,7 +43,7 @@ struct utmpx *getutxline(const struct utmpx *);
 struct utmpx *pututxline(const struct utmpx *);
 void          setutxent(void);
 
-#if defined(_BSD_SOURCE) | defined(_GNU_SOURCE)
+#if defined(_BSD_SOURCE) || defined(_GNU_SOURCE)
 #define e_exit __e_exit
 #define e_termination __e_termination
 void updwtmpx(const char *, const struct utmpx *);