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.

ticket: 6532
version_fixed: 1.7.1
status: resolved

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

diff --git a/src/appl/gssftp/ftp/cmds.c b/src/appl/gssftp/ftp/cmds.c
index ac7a8039f8403adbdb84f3c85fccb5dc949ee77c..b7f8d8d809e62480e09eba885cd3d9bc32fa8abc 100644 (file)
--- 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