[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] build fixes for alphaev67-dec-osf5.1 and i386-unknown-freebs
From: |
Simon Josefsson |
Subject: |
Re: [PATCH] build fixes for alphaev67-dec-osf5.1 and i386-unknown-freebsd4.7 |
Date: |
Fri, 06 Dec 2002 10:49:10 +0100 |
User-agent: |
Gnus/5.090008 (Oort Gnus v0.08) Emacs/21.3.50 (i686-pc-linux-gnu) |
> -#if defined(HAVE_STRUCT_UTMP_UT_ID)
> +#if (defined(UTMPX) && defined(HAVE_STRUCT_UTMPX_UT_ID)) ||
> + (!defined(UTMPX) && defined(HAVE_STRUCT_UTMP_UT_ID))
Oops, I forgot \'s, this one is better:
Index: utmp_init.c
===================================================================
RCS file: /cvsroot/inetutils/inetutils/libinetutils/utmp_init.c,v
retrieving revision 1.8
diff -u -p -u -w -r1.8 utmp_init.c
--- utmp_init.c 14 May 2002 15:15:05 -0000 1.8
+++ utmp_init.c 6 Dec 2002 09:46:28 -0000
@@ -53,22 +53,27 @@ utmp_init(char *line, char *user, ch
#endif
memset((char *) &utx, 0, sizeof(utx));
-#if defined(HAVE_STRUCT_UTMP_UT_ID)
+#if (defined(UTMPX) && defined(HAVE_STRUCT_UTMPX_UT_ID)) || \
+ (!defined(UTMPX) && defined(HAVE_STRUCT_UTMP_UT_ID))
strncpy(utx.ut_id, id, sizeof(utx.ut_id));
#endif
-#if defined(HAVE_STRUCT_UTMP_UT_USER)
+#if (defined(UTMPX) && defined(HAVE_STRUCT_UTMP_UT_USER)) || \
+ (!defined(UTMPX) && defined(HAVE_STRUCT_UTMP_UT_USER))
strncpy(utx.ut_user, user, sizeof(utx.ut_user));
#else
strncpy(utx.ut_name, user, sizeof(utx.ut_name));
#endif
strncpy(utx.ut_line, line, sizeof(utx.ut_line));
-#if defined(HAVE_STRUCT_UTMP_UT_PID)
+#if (defined(UTMPX) && defined(HAVE_STRUCT_UTMP_UT_PID)) || \
+ (!defined(UTMPX) && defined(HAVE_STRUCT_UTMP_UT_PID))
utx.ut_pid = getpid();
#endif
-#if defined(HAVE_STRUCT_UTMP_UT_TYPE)
+#if (defined(UTMPX) && defined(HAVE_STRUCT_UTMP_UT_TYPE)) || \
+ (!defined(UTMPX) && defined(HAVE_STRUCT_UTMP_UT_TYPE))
utx.ut_type = LOGIN_PROCESS;
#endif
-#if defined(HAVE_STRUCT_UTMPX_UT_TV)
+#if (defined(UTMPX) && defined(HAVE_STRUCT_UTMP_UT_TV)) || \
+ (!defined(UTMPX) && defined(HAVE_STRUCT_UTMP_UT_TV))
gettimeofday(&(utx.ut_tv), 0);
#else
time(&(utx.ut_time));