projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SCNX* macros don't exist.
[gnulib.git]
/
lib
/
readutmp.h
diff --git
a/lib/readutmp.h
b/lib/readutmp.h
index
d04c94d
..
8983a85
100644
(file)
--- a/
lib/readutmp.h
+++ b/
lib/readutmp.h
@@
-1,7
+1,7
@@
/* Declarations for GNU's read utmp module.
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
/* Declarations for GNU's read utmp module.
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
- 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ 2001, 2002, 2003, 2004, 2005
, 2006
Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-15,7
+15,7
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
- Inc., 5
9 Temple Place - Suite 330, Boston, MA 02111-1307
, USA. */
+ Inc., 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
, USA. */
/* Written by jla; revised by djm */
/* Written by jla; revised by djm */
@@
-31,8
+31,8
@@
# undef HAVE_UTMPX_H
# endif
# undef HAVE_UTMPX_H
# endif
-# if
def
HAVE_UTMPX_H
-# if
def
HAVE_UTMP_H
+# if HAVE_UTMPX_H
+# if HAVE_UTMP_H
/* HPUX 10.20 needs utmp.h, for the definition of e.g., UTMP_FILE. */
# include <utmp.h>
# endif
/* HPUX 10.20 needs utmp.h, for the definition of e.g., UTMP_FILE. */
# include <utmp.h>
# endif
@@
-66,7
+66,8
@@
# endif
# endif
# endif
# endif
-# else
+# elif HAVE_UTMP_H
+
# include <utmp.h>
# if !HAVE_DECL_GETUTENT
struct utmp *getutent();
# include <utmp.h>
# if !HAVE_DECL_GETUTENT
struct utmp *getutent();
@@
-103,7
+104,7
@@
# endif
/* Accessor macro for the member named ut_user or ut_name. */
# endif
/* Accessor macro for the member named ut_user or ut_name. */
-# if
def
HAVE_UTMPX_H
+# if HAVE_UTMPX_H
# if HAVE_STRUCT_UTMPX_UT_USER
# define UT_USER(Utmp) ((Utmp)->ut_user)
# if HAVE_STRUCT_UTMPX_UT_USER
# define UT_USER(Utmp) ((Utmp)->ut_user)
@@
-113,7
+114,7
@@
# define UT_USER(Utmp) ((Utmp)->ut_name)
# endif
# define UT_USER(Utmp) ((Utmp)->ut_name)
# endif
-# el
se
+# el
if HAVE_UTMP_H
# if HAVE_STRUCT_UTMP_UT_USER
# define UT_USER(Utmp) ((Utmp)->ut_user)
# if HAVE_STRUCT_UTMP_UT_USER
# define UT_USER(Utmp) ((Utmp)->ut_user)
@@
-141,11
+142,11
@@
typedef struct UTMP_STRUCT_NAME STRUCT_UTMP;
enum { UT_USER_SIZE = sizeof UT_USER ((STRUCT_UTMP *) 0) };
enum { UT_USER_SIZE = sizeof UT_USER ((STRUCT_UTMP *) 0) };
-# if !defined
(UTMP_FILE) && defined (_PATH_UTMP)
+# if !defined
UTMP_FILE && defined _PATH_UTMP
# define UTMP_FILE _PATH_UTMP
# endif
# define UTMP_FILE _PATH_UTMP
# endif
-# if !defined
(WTMP_FILE) && defined (_PATH_WTMP)
+# if !defined
WTMP_FILE && defined _PATH_WTMP
# define WTMP_FILE _PATH_WTMP
# endif
# define WTMP_FILE _PATH_WTMP
# endif
@@
-205,7
+206,7
@@
enum
};
char *extract_trimmed_name (const STRUCT_UTMP *ut);
};
char *extract_trimmed_name (const STRUCT_UTMP *ut);
-int read_utmp (c
onst char *filenam
e, size_t *n_entries, STRUCT_UTMP **utmp_buf,
+int read_utmp (c
har const *fil
e, size_t *n_entries, STRUCT_UTMP **utmp_buf,
int options);
#endif /* __READUTMP_H__ */
int options);
#endif /* __READUTMP_H__ */