diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2005-03-03 22:08:12 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2005-03-03 22:08:12 +0000 |
| commit | 6b76b0c5d4cfa2ba26b33ce375f83642eb071600 (patch) | |
| tree | 6ba0d85073a00fb816bcea853d0797b99a9de89f /winsup/cygwin/include | |
| parent | 33aca5632219e9ca6ca44b6257c53618249bf3c3 (diff) | |
| download | cygnal-6b76b0c5d4cfa2ba26b33ce375f83642eb071600.tar.gz cygnal-6b76b0c5d4cfa2ba26b33ce375f83642eb071600.tar.bz2 cygnal-6b76b0c5d4cfa2ba26b33ce375f83642eb071600.zip | |
* cygwin.din (utmpxname): Export.
* syscalls.cc (utmpxname): Create export alias to utmpname.
* include/utmpx.h: Define ut_name and ut_xtime if not already defined.
(utmpxname): Add prototype.
* include/sys/utmp.h: Only define ut_name if not already defined.
* include/cygwin/version.h: Bump API minor version.
Diffstat (limited to 'winsup/cygwin/include')
| -rw-r--r-- | winsup/cygwin/include/cygwin/version.h | 3 | ||||
| -rw-r--r-- | winsup/cygwin/include/sys/utmp.h | 5 | ||||
| -rw-r--r-- | winsup/cygwin/include/utmpx.h | 9 |
3 files changed, 15 insertions, 2 deletions
diff --git a/winsup/cygwin/include/cygwin/version.h b/winsup/cygwin/include/cygwin/version.h index 9128505ef..6d965fdff 100644 --- a/winsup/cygwin/include/cygwin/version.h +++ b/winsup/cygwin/include/cygwin/version.h @@ -249,12 +249,13 @@ details. */ 119: Export fdatasync. 120: Export basename, dirname. 122: Export statvfs, fstatvfs. + 123: Export utmpxname. */ /* Note that we forgot to bump the api for ualarm, strtoll, strtoull */ #define CYGWIN_VERSION_API_MAJOR 0 -#define CYGWIN_VERSION_API_MINOR 122 +#define CYGWIN_VERSION_API_MINOR 123 /* There is also a compatibity version number associated with the shared memory regions. It is incremented when incompatible diff --git a/winsup/cygwin/include/sys/utmp.h b/winsup/cygwin/include/sys/utmp.h index ebc70b9bc..435891b18 100644 --- a/winsup/cygwin/include/sys/utmp.h +++ b/winsup/cygwin/include/sys/utmp.h @@ -17,7 +17,10 @@ extern "C" { #endif -#define ut_name ut_user +#ifndef ut_name +#define ut_name ut_user +#endif + struct utmp { diff --git a/winsup/cygwin/include/utmpx.h b/winsup/cygwin/include/utmpx.h index 395c7a09a..0e24ce884 100644 --- a/winsup/cygwin/include/utmpx.h +++ b/winsup/cygwin/include/utmpx.h @@ -32,12 +32,21 @@ struct utmpx struct timeval ut_tv; }; +#ifndef ut_name +#define ut_name ut_user +#endif + +#ifndef ut_xtime +#define ut_xtime ut_tv.tv_sec +#endif + extern void endutxent (void); extern struct utmpx *getutxent (void); extern struct utmpx *getutxid (const struct utmpx *id); extern struct utmpx *getutxline (const struct utmpx *line); extern struct utmpx *pututxline (const struct utmpx *utmpx); extern void setutxent (void); +extern void utmpxname (const char *file); #ifdef __cplusplus } |