about summary refs log tree commit diff
path: root/Src/watch.c
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2005-04-04 09:58:44 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2005-04-04 09:58:44 +0000
commit8776b52d7d4c9adc5774a231e3a4a8ecfd8bad7b (patch)
tree638b7fdd0439936514d444badd61e0f61611cd4e /Src/watch.c
parent82c9c7a42351c5b674153149c761eaa0103cd89e (diff)
downloadzsh-8776b52d7d4c9adc5774a231e3a4a8ecfd8bad7b.tar.gz
zsh-8776b52d7d4c9adc5774a231e3a4a8ecfd8bad7b.tar.xz
zsh-8776b52d7d4c9adc5774a231e3a4a8ecfd8bad7b.zip
Toby Peterson: 21083: RLIMIT_AS and RLIMIT_RSS are the same in Mac OX X
ut_name needs to be ut_user in struct utmpx
Diffstat (limited to 'Src/watch.c')
-rw-r--r--Src/watch.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/Src/watch.c b/Src/watch.c
index c12625c85..402b160fe 100644
--- a/Src/watch.c
+++ b/Src/watch.c
@@ -87,6 +87,14 @@
 
 #if !defined(WATCH_STRUCT_UTMP) && defined(HAVE_STRUCT_UTMPX) && defined(REAL_UTMPX_FILE)
 # define WATCH_STRUCT_UTMP struct utmpx
+/*
+ * In utmpx, the ut_name field is replaced by ut_user.
+ * Howver, on some systems ut_name may already be defined this
+ * way for the purposes of utmp.
+ */
+# ifndef ut_name
+#  define ut_name ut_user
+# endif
 # ifdef HAVE_STRUCT_UTMPX_UT_XTIME
 #  undef ut_time
 #  define ut_time ut_xtime