[gentoo-commits] gentoo-x86 commit in app-crypt/mit-krb5-appl/files: mit-krb5-appl-sig_t.patch

[Eray Aslan (eras)]

eras        14/06/20 09:51:39

  Added:                mit-krb5-appl-sig_t.patch
  Log:
  Fix build failure - bug #513762
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x77F1F175586A3B1F)

Revision  Changes    Path
1.1                  app-crypt/mit-krb5-appl/files/mit-krb5-appl-sig_t.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/mit-krb5-appl/files/mit-krb5-appl-sig_t.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/mit-krb5-appl/files/mit-krb5-appl-sig_t.patch?rev=1.1&content-type=text/plain

Index: mit-krb5-appl-sig_t.patch
===================================================================
Bug #513762

From 4b45a32ba7c4f7b447919de6ce28a14150584290 Mon Sep 17 00:00:00 2001
From: Russ Allbery <rra@××××××××.edu>
Date: Wed, 21 Mar 2012 04:16:36 +0000
Subject: [PATCH] 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.

git-svn-id: svn://anonsvn.mit.edu/krb5-appl/trunk@3331 dc483132-0cff-0310-8789-dd5450dbe970
---
 gssftp/ftp/ftp_var.h | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/gssftp/ftp/ftp_var.h b/gssftp/ftp/ftp_var.h
index 3efbdb1..e478961 100644
--- a/gssftp/ftp/ftp_var.h
+++ b/gssftp/ftp/ftp_var.h
@@ -53,15 +53,6 @@ FILE* fdopen_socket(SOCKET s, char* mode);
 #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 int macnum;		/* number of defined macros */
 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
-- 
1.9.3