RepoMirrors
/
musl
mirror of git://git.musl-libc.org/musl
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix namespace violations in utmpx.h

This commit is contained in:
Rich Felker 2014-01-08 19:36:29 -05:00
parent d18df33cb1
commit a1527a0c3e
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/utmp.h
View File

@ -10,6 +10,7 @@ extern "C" {
#define ACCOUNTING 9 #define ACCOUNTING 9
#define UT_NAMESIZE 32 #define UT_NAMESIZE 32
#define UT_HOSTSIZE 256 #define UT_HOSTSIZE 256
#define UT_LINESIZE 32
struct lastlog { struct lastlog {
time_t ll_time; time_t ll_time;
@ -22,6 +23,8 @@ struct lastlog {
#define ut_addr ut_addr_v6[0] #define ut_addr ut_addr_v6[0]
#define utmp utmpx #define utmp utmpx
#define utmpname(x) (-1) #define utmpname(x) (-1)
#define e_exit __e_exit
#define e_termination __e_termination
void endutent(void); void endutent(void);
struct utmp *getutent(void); struct utmp *getutent(void);

14
include/utmpx.h
View File

@ -5,6 +5,8 @@
extern "C" { extern "C" {
#endif #endif
#include <features.h>
#define __NEED_pid_t #define __NEED_pid_t
#define __NEED_time_t #define __NEED_time_t
#define __NEED_suseconds_t #define __NEED_suseconds_t
@ -12,19 +14,17 @@ extern "C" {
#include <bits/alltypes.h> #include <bits/alltypes.h>
#define UT_LINESIZE 32
struct utmpx struct utmpx
{ {
short ut_type; short ut_type;
pid_t ut_pid; pid_t ut_pid;
char ut_line[UT_LINESIZE]; char ut_line[32];
char ut_id[4]; char ut_id[4];
char ut_user[32]; char ut_user[32];
char ut_host[256]; char ut_host[256];
struct { struct {
short e_termination; short __e_termination;
short e_exit; short __e_exit;
} ut_exit; } ut_exit;
long ut_session; long ut_session;
struct timeval ut_tv; struct timeval ut_tv;
@ -39,7 +39,11 @@ struct utmpx *getutxline(const struct utmpx *);
struct utmpx *pututxline(const struct utmpx *); struct utmpx *pututxline(const struct utmpx *);
void setutxent(void); 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 *); void updwtmpx(const char *, const struct utmpx *);
#endif
#define EMPTY 0 #define EMPTY 0
#define RUN_LVL 1 #define RUN_LVL 1