summary refs log tree commit diff
diff options
context:
space:
mode:
authorGerrit Pape <pape@smarden.org>2007-06-26 08:31:52 +0000
committerGerrit Pape <pape@smarden.org>2007-08-27 14:14:34 +0000
commitf2ae55e8662d9a71e127da637584dff415c07e9f (patch)
treedf0472b792a18ec83e0ecbe8f79ee41356a24762
parent6dd65f1fe3021ba4ddbb3e374dc24c8acbd24ddf (diff)
downloadrunit-f2ae55e8662d9a71e127da637584dff415c07e9f.tar.gz
runit-f2ae55e8662d9a71e127da637584dff415c07e9f.tar.xz
runit-f2ae55e8662d9a71e127da637584dff415c07e9f.zip
uw_tmp.h1: fallback to UTMP_FILE if _PATH_UTMP is not defined as seen
on AIX 5.2 ML1, AIX 5.3 ML5 (thx Daniel Clark).
-rw-r--r--package/CHANGES2
-rw-r--r--src/uw_tmp.h110
2 files changed, 12 insertions, 0 deletions
diff --git a/package/CHANGES b/package/CHANGES
index 3b4ac5c..3ad6f83 100644
--- a/package/CHANGES
+++ b/package/CHANGES
@@ -11,6 +11,8 @@
   * doc/useinit.html: add instructions on how to use with upstart (thx
     Lloyd Zusman).
   * chpst.c: add explicit braces to avoid ambiguous 'else'.
+  * uw_tmp.h1: fallback to UTMP_FILE if _PATH_UTMP is not defined as seen
+    on AIX 5.2 ML1, AIX 5.3 ML5 (thx Daniel Clark).
 
 1.7.2
 Tue, 21 Nov 2006 15:13:47 +0000
diff --git a/src/uw_tmp.h1 b/src/uw_tmp.h1
index 57231fb..2d5e994 100644
--- a/src/uw_tmp.h1
+++ b/src/uw_tmp.h1
@@ -3,7 +3,17 @@
 
 /* sysdep: -utmpx */
 
+#ifdef _PATH_UTMP
 #define UW_TMP_UFILE _PATH_UTMP
 #define UW_TMP_WFILE _PATH_WTMP
+#else
+/* AIX only has UTMP_FILE */
+#ifdef UTMP_FILE
+#define UW_TMP_UFILE UTMP_FILE
+#define UW_TMP_WFILE WTMP_FILE
+#else
+#error neither _PATH_UTMP nor UTMP_FILE defined.
+#endif
+#endif
 
 typedef struct utmp uw_tmp;