summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2010-01-13 23:00:38 +1100
committerDarren Tucker <dtucker@zip.com.au>2010-01-13 23:00:38 +1100
commit096630d06c75f762efeb778f8b43def6f85976c0 (patch)
treed64d51dc7eb4b5d109142b00e8b80e064fa5b7cf
parent9c3ba07f60434e68657630fec0d7ab0dd7f984a3 (diff)
downloadopenssh-git-096630d06c75f762efeb778f8b43def6f85976c0.tar.gz
- (dtucker) [sftp-common.c] Wrap include of util.h in an ifdef.
-rw-r--r--ChangeLog1
-rw-r--r--sftp-common.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 00cb316b..18ce0aa3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,6 +30,7 @@
[sftp.c]
don't append a space after inserting a completion of a directory (i.e.
a path ending in '/') for a slightly better user experience; ok dtucker@
+ - (dtucker) [sftp-common.c] Wrap include of util.h in an ifdef.
20100112
- (dtucker) OpenBSD CVS Sync
diff --git a/sftp-common.c b/sftp-common.c
index 7393fc6a..96eb4f79 100644
--- a/sftp-common.c
+++ b/sftp-common.c
@@ -36,7 +36,9 @@
#include <string.h>
#include <time.h>
#include <stdarg.h>
+#ifdef HAVE_UTIL_H
#include <util.h>
+#endif
#include "xmalloc.h"
#include "buffer.h"