From: dtucker <dtucker>
Date: Wed, 13 Jan 2010 12:00:38 +0000 (+0000)
Subject:  - (dtucker) [sftp-common.c] Wrap include of util.h in an ifdef.
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/c1e654ec6b498feeb797eaf15aa63fa4d46a0d00?ds=sidebyside

 - (dtucker) [sftp-common.c] Wrap include of util.h in an ifdef.
---

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"