source: npl/fileserver/mit-kerberos-app/mit-krb5-appl-sig_t.patch @ 0105685

gcc484ntopperl-5.22
Last change on this file since 0105685 was c5c522c, checked in by Edwin Eefting <edwin@datux.nl>, 8 years ago

initial commit, transferred from cleaned syn3 svn tree
  • Property mode set to 100644
File size: 1.4 KB

  • gssftp/ftp/ftp_var.h 

    Bug #513762

From 4b45a32ba7c4f7b447919de6ce28a14150584290 Mon Sep 17 00:00:00 2001
From: Russ Allbery <rra@stanford.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 b FILE* fdopen_socket(SOCKET s, char* mode); 
    5353#define PERROR_SOCKET(str) perror(str)
    5454#endif
    5555
    56 #ifdef _WIN32
    57 typedef void (*sig_t)(int);
    58 typedef void sigtype;
    59 #else
    60 #define sig_t my_sig_t
    61 #define sigtype krb5_sigtype
    62 typedef sigtype (*sig_t)();
    63 #endif
    64 
    6556/*
    6657 * FTP global variables.
    6758 */
    … … extern int macnum; /* number of defined macros */ 
    168159extern struct macel macros[16];
    169160extern char macbuf[4096];
    170161
     162#ifdef _WIN32
     163typedef void (*sig_t)(int);
     164typedef void sigtype;
     165#else
     166#define sig_t my_sig_t
     167#define sigtype krb5_sigtype
     168typedef sigtype (*sig_t)();
     169#endif
     170
    171171#ifdef DEFINITIONS
    172172#undef extern
    173173#endif
Note: See TracBrowser for help on using the repository browser.