[c5c522c] | 1 | Bug #513762 |
---|
| 2 | |
---|
| 3 | From 4b45a32ba7c4f7b447919de6ce28a14150584290 Mon Sep 17 00:00:00 2001 |
---|
| 4 | From: Russ Allbery <rra@stanford.edu> |
---|
| 5 | Date: Wed, 21 Mar 2012 04:16:36 +0000 |
---|
| 6 | Subject: [PATCH] Move redeclaration of sig_t after all system includes |
---|
| 7 | |
---|
| 8 | Move some internal messing about with sig_t done by gssftp/ftp/ftp_var.h |
---|
| 9 | after the last system include to keep from stomping on system headers. |
---|
| 10 | Required for kFreeBSD and Hurd. |
---|
| 11 | |
---|
| 12 | git-svn-id: svn://anonsvn.mit.edu/krb5-appl/trunk@3331 dc483132-0cff-0310-8789-dd5450dbe970 |
---|
| 13 | --- |
---|
| 14 | gssftp/ftp/ftp_var.h | 18 +++++++++--------- |
---|
| 15 | 1 file changed, 9 insertions(+), 9 deletions(-) |
---|
| 16 | |
---|
| 17 | diff --git a/gssftp/ftp/ftp_var.h b/gssftp/ftp/ftp_var.h |
---|
| 18 | index 3efbdb1..e478961 100644 |
---|
| 19 | --- a/gssftp/ftp/ftp_var.h |
---|
| 20 | +++ b/gssftp/ftp/ftp_var.h |
---|
| 21 | @@ -53,15 +53,6 @@ FILE* fdopen_socket(SOCKET s, char* mode); |
---|
| 22 | #define PERROR_SOCKET(str) perror(str) |
---|
| 23 | #endif |
---|
| 24 | |
---|
| 25 | -#ifdef _WIN32 |
---|
| 26 | -typedef void (*sig_t)(int); |
---|
| 27 | -typedef void sigtype; |
---|
| 28 | -#else |
---|
| 29 | -#define sig_t my_sig_t |
---|
| 30 | -#define sigtype krb5_sigtype |
---|
| 31 | -typedef sigtype (*sig_t)(); |
---|
| 32 | -#endif |
---|
| 33 | - |
---|
| 34 | /* |
---|
| 35 | * FTP global variables. |
---|
| 36 | */ |
---|
| 37 | @@ -168,6 +159,15 @@ extern int macnum; /* number of defined macros */ |
---|
| 38 | extern struct macel macros[16]; |
---|
| 39 | extern char macbuf[4096]; |
---|
| 40 | |
---|
| 41 | +#ifdef _WIN32 |
---|
| 42 | +typedef void (*sig_t)(int); |
---|
| 43 | +typedef void sigtype; |
---|
| 44 | +#else |
---|
| 45 | +#define sig_t my_sig_t |
---|
| 46 | +#define sigtype krb5_sigtype |
---|
| 47 | +typedef sigtype (*sig_t)(); |
---|
| 48 | +#endif |
---|
| 49 | + |
---|
| 50 | #ifdef DEFINITIONS |
---|
| 51 | #undef extern |
---|
| 52 | #endif |
---|
| 53 | -- |
---|
| 54 | 1.9.3 |
---|
| 55 | |
---|