* 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.
This commit is contained in:
Corinna Vinschen 2005-03-03 22:08:12 +00:00
parent 33aca56322
commit 6b76b0c5d4
6 changed files with 26 additions and 2 deletions

View File

@ -1,3 +1,12 @@
2005-03-03 Corinna Vinschen <corinna@vinschen.de>
* 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.
2005-03-03 Christopher Faylor <cgf@timesys.com> 2005-03-03 Christopher Faylor <cgf@timesys.com>
* cygthread.cc (cygthread::detach): Use a slightly higher priority when * cygthread.cc (cygthread::detach): Use a slightly higher priority when

View File

@ -1489,6 +1489,7 @@ utimes SIGFE
_utimes = utimes SIGFE _utimes = utimes SIGFE
utmpname SIGFE utmpname SIGFE
_utmpname = utmpname SIGFE _utmpname = utmpname SIGFE
utmpxname SIGFE
valloc SIGFE valloc SIGFE
vasprintf SIGFE vasprintf SIGFE
_vasprintf = vasprintf SIGFE _vasprintf = vasprintf SIGFE

View File

@ -249,12 +249,13 @@ details. */
119: Export fdatasync. 119: Export fdatasync.
120: Export basename, dirname. 120: Export basename, dirname.
122: Export statvfs, fstatvfs. 122: Export statvfs, fstatvfs.
123: Export utmpxname.
*/ */
/* Note that we forgot to bump the api for ualarm, strtoll, strtoull */ /* Note that we forgot to bump the api for ualarm, strtoll, strtoull */
#define CYGWIN_VERSION_API_MAJOR 0 #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 /* There is also a compatibity version number associated with the
shared memory regions. It is incremented when incompatible shared memory regions. It is incremented when incompatible

View File

@ -17,7 +17,10 @@
extern "C" { extern "C" {
#endif #endif
#define ut_name ut_user #ifndef ut_name
#define ut_name ut_user
#endif
struct utmp struct utmp
{ {

View File

@ -32,12 +32,21 @@ struct utmpx
struct timeval ut_tv; 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 void endutxent (void);
extern struct utmpx *getutxent (void); extern struct utmpx *getutxent (void);
extern struct utmpx *getutxid (const struct utmpx *id); extern struct utmpx *getutxid (const struct utmpx *id);
extern struct utmpx *getutxline (const struct utmpx *line); extern struct utmpx *getutxline (const struct utmpx *line);
extern struct utmpx *pututxline (const struct utmpx *utmpx); extern struct utmpx *pututxline (const struct utmpx *utmpx);
extern void setutxent (void); extern void setutxent (void);
extern void utmpxname (const char *file);
#ifdef __cplusplus #ifdef __cplusplus
} }

View File

@ -2597,6 +2597,7 @@ utmpname (const char *file)
utmp_file = strdup (file); utmp_file = strdup (file);
debug_printf ("New UTMP file: %s", utmp_file); debug_printf ("New UTMP file: %s", utmp_file);
} }
EXPORT_ALIAS (utmpname, utmpxname)
/* Note: do not make NO_COPY */ /* Note: do not make NO_COPY */
static struct utmp utmp_data_buf[16]; static struct utmp utmp_data_buf[16];