[26445] in CVS-changelog-for-Kerberos-V5
svn rev #3331: trunk/gssftp/ftp/
daemon@ATHENA.MIT.EDU (rra@mit.edu)
Wed Mar 21 00:19:06 2012
Date: Wed, 21 Mar 2012 00:16:36 -0400
From: rra@mit.edu
Message-Id: <201203210416.q2L4GaK3023338@drugstore.mit.edu>
To: krb5-appl-commits@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: krb5-appl-commits-bounces@mit.edu
Commit By: rra
Log Message:
Move redeclaration of sig_t after all system includes.
Move some internal messing about with sig_t done by gssftp/ftp/ftp_var.h
after the last system include to keep from stomping on system headers.
Required for kFreeBSD and Hurd.
Changed Files:
U trunk/gssftp/ftp/ftp_var.h
Modified: trunk/gssftp/ftp/ftp_var.h
===================================================================
--- trunk/gssftp/ftp/ftp_var.h 2012-01-27 20:41:46 UTC (rev 3330)
+++ trunk/gssftp/ftp/ftp_var.h 2012-03-21 04:16:36 UTC (rev 3331)
@@ -53,15 +53,6 @@
#define PERROR_SOCKET(str) perror(str)
#endif
-#ifdef _WIN32
-typedef void (*sig_t)(int);
-typedef void sigtype;
-#else
-#define sig_t my_sig_t
-#define sigtype krb5_sigtype
-typedef sigtype (*sig_t)();
-#endif
-
/*
* FTP global variables.
*/
@@ -168,6 +159,15 @@
extern struct macel macros[16];
extern char macbuf[4096];
+#ifdef _WIN32
+typedef void (*sig_t)(int);
+typedef void sigtype;
+#else
+#define sig_t my_sig_t
+#define sigtype krb5_sigtype
+typedef sigtype (*sig_t)();
+#endif
+
#ifdef DEFINITIONS
#undef extern
#endif
_______________________________________________
Krb5-appl-commits mailing list
Krb5-appl-commits@mit.edu
http://mailman.mit.edu/mailman/listinfo/krb5-appl-commits
