summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2008-06-07 06:25:15 +1000
committerDarren Tucker <dtucker@zip.com.au>2008-06-07 06:25:15 +1000
commitce38d8234d6969e4c222a0110e80357c2a61162c (patch)
treea05cb6e2f39743b6d0417184d99778f8efd7ad30
parent58ea61ba2a747e4f0beb3afcbbdea8ada5119143 (diff)
- (dtucker) [mux.c] Include paths.h inside ifdef HAVE_PATHS_H.
-rw-r--r--ChangeLog5
-rw-r--r--mux.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 727767210..c3c849c22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
120080607
2 - (dtucker) [mux.c] Include paths.h inside ifdef HAVE_PATHS_H.
3
120080604 420080604
2 - (djm) [openbsd-compat/bsd-arc4random.c] Fix math bug that caused bias 5 - (djm) [openbsd-compat/bsd-arc4random.c] Fix math bug that caused bias
3 in arc4random_uniform with upper_bound in (2^30,2*31). Note that 6 in arc4random_uniform with upper_bound in (2^30,2*31). Note that
@@ -4028,4 +4031,4 @@
4028 OpenServer 6 and add osr5bigcrypt support so when someone migrates 4031 OpenServer 6 and add osr5bigcrypt support so when someone migrates
4029 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 4032 passwords between UnixWare and OpenServer they will still work. OK dtucker@
4030 4033
4031$Id: ChangeLog,v 1.4936 2008/06/04 00:54:00 djm Exp $ 4034$Id: ChangeLog,v 1.4937 2008/06/06 20:25:15 dtucker Exp $
diff --git a/mux.c b/mux.c
index b4465b017..8b9105b04 100644
--- a/mux.c
+++ b/mux.c
@@ -34,7 +34,9 @@
34#include <stdio.h> 34#include <stdio.h>
35#include <string.h> 35#include <string.h>
36#include <unistd.h> 36#include <unistd.h>
37#ifdef HAVE_PATHS_H
37#include <paths.h> 38#include <paths.h>
39#endif
38 40
39#ifdef HAVE_UTIL_H 41#ifdef HAVE_UTIL_H
40# include <util.h> 42# include <util.h>