aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii <[email protected]>2002-04-17 19:39:00 +0000
committerEli Zaretskii <[email protected]>2002-04-17 19:39:00 +0000
commit1a4140b0b4c980ac326a55425f41d26ff265d32c (patch)
tree7ac95adcd1544d1747bb6f15ae05fc246eb78d80
parent18f10eda02b621d813d9f66b0ffb9aea180e7a58 (diff)
(HAVE_LIBKSTAT): Define only if not already defined.
-rw-r--r--src/ChangeLog4
-rw-r--r--src/s/sol2.h5
2 files changed, 8 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 0604df403f..b4c3341773 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2002-04-17 Eli Zaretskii <[email protected]>
+
+ * s/sol2.h (HAVE_LIBKSTAT): Define only if not already defined.
+
2002-04-17 Juanma Barranquero <[email protected]>
* indent.c (Fmove_to_column): Remove unused local variable
diff --git a/src/s/sol2.h b/src/s/sol2.h
index be6edf0aa9..ed82812bc6 100644
--- a/src/s/sol2.h
+++ b/src/s/sol2.h
@@ -27,8 +27,11 @@
#define LIBS_SYSTEM -lsocket -lnsl -lkstat
/* Prefer kstat over kvm in getloadavg.c, kstat doesn't require root.
- [email protected], 7/21/97. */
+ [email protected], 7/21/97. Don't redefine if already defined
+ (e.g., by config.h). */
+#ifndef HAVE_LIBKSTAT
#define HAVE_LIBKSTAT
+#endif
/* eggert thinks all versions of SunPro C allowed this. */
#ifndef __GNUC__