From: Tom Yu <tlyu@mit.edu>
Date: Fri, 17 Jul 2009 01:45:23 +0000 (+0000)
Subject: ticket; 6531
X-Git-Tag: kfw-3.2.3-alpha1~6
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6d00e9692be287b02c2c3e7dd9a2f11c10c855cc;p=krb5.git

ticket; 6531
version_fixed: 1.6.4

pull up r22443 from trunk

 ------------------------------------------------------------------------
 r22443 | tlyu | 2009-07-16 21:35:58 -0400 (Thu, 16 Jul 2009) | 8 lines

 ticket: 6531
 target_version: 1.6.4
 tags: pullup
 subject: include win-mac.h in gssftp/ftp/cmds.c for HAVE_STDLIB_H

 gssftp/ftp/cmds.c had a preprocessor conditional on HAVE_STDLIB_H that
 will not evaluate correctly on WIN32 unless win-mac.h is included first.

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-6@22444 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/appl/gssftp/ftp/cmds.c b/src/appl/gssftp/ftp/cmds.c
index 5044b4482..0e864c4da 100644
--- a/src/appl/gssftp/ftp/cmds.c
+++ b/src/appl/gssftp/ftp/cmds.c
@@ -38,6 +38,10 @@ static char sccsid[] = "@(#)cmds.c	5.26 (Berkeley) 3/5/91";
 /*
  * FTP User Program -- Command Routines.
  */
+#ifdef _WIN32
+#include <win-mac.h>
+#endif
+
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif