From 31a2106a390a69a94e011e7406f3e67ad298258d Mon Sep 17 00:00:00 2001 From: Gerhard Rieger Date: Fri, 9 Dec 2016 22:38:30 +0100 Subject: [PATCH] Corrected declarations of diag_immediate_msg etc. --- CHANGES | 6 ++++++ error.h | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 4a5cefa..e250c83 100644 --- a/CHANGES +++ b/CHANGES @@ -8,6 +8,12 @@ corrections: Include for ptrdiff_t Thanks to Jeroen Roovers for reporting this issue. +porting: + Type conflict between int and sig_atomic_t between declaration and + definition of diag_immediate_type and diag_immediate_exit broke + compilation on FreeBSD 10.1 with clang. Thanks to Emanuel Haupt for + reporting this bug. + testing: socks4echo.sh and socks4a-echo.sh hung with new bash with read -n diff --git a/error.h b/error.h index e743a3a..09c0727 100644 --- a/error.h +++ b/error.h @@ -229,8 +229,8 @@ struct diag_dgram { } ; extern sig_atomic_t diag_in_handler; -extern int diag_immediate_msg; -extern int diag_immediate_exit; +extern sig_atomic_t diag_immediate_msg; +extern sig_atomic_t diag_immediate_exit; extern void diag_set(char what, const char *arg); extern void diag_set_int(char what, int arg);