svn rev #22807: branches/krb5-1-7/src/appl/gssftp/ftp/

[tlyu@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=22807
Commit By: tlyu
Log Message:
ticket: 6532
version_fixed: 1.7.1
status: resolved

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.


Changed Files:
U   branches/krb5-1-7/src/appl/gssftp/ftp/cmds.c
Modified: branches/krb5-1-7/src/appl/gssftp/ftp/cmds.c
===================================================================
--- branches/krb5-1-7/src/appl/gssftp/ftp/cmds.c	2009-09-29 00:31:54 UTC (rev 22806)
+++ branches/krb5-1-7/src/appl/gssftp/ftp/cmds.c	2009-09-29 01:12:25 UTC (rev 22807)
@@ -38,6 +38,10 @@
 /*
  * FTP User Program -- Command Routines.
  */
+#ifdef _WIN32
+#include <win-mac.h>
+#endif
+
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif