From 6af7c19743212e9a1d15370bad53aced4b1c386a Mon Sep 17 00:00:00 2001
From: manojampalam <manojampalam@live.com>
Date: Sun, 20 Mar 2016 22:58:37 -0700
Subject: [PATCH] minor updates to signal implementation

---
 contrib/win32/win32compat/includes/sys/compat-types.h | 8 +-------
 contrib/win32/win32compat/includes/sys/param.h        | 7 +++++++
 contrib/win32/win32compat/signal.c                    | 4 ++--
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/contrib/win32/win32compat/includes/sys/compat-types.h b/contrib/win32/win32compat/includes/sys/compat-types.h
index a47a9c6..b8c0d73 100644
--- a/contrib/win32/win32compat/includes/sys/compat-types.h
+++ b/contrib/win32/win32compat/includes/sys/compat-types.h
@@ -3,13 +3,7 @@
 
 
 /* Compatibility header to allow code that uses these types to compile on Win32 */
-
-typedef unsigned int uid_t;
-typedef unsigned int gid_t;
-typedef long _off_t;
-typedef long off_t;
-typedef unsigned int _dev_t;
-typedef unsigned int dev_t;				/* device code */
+				/* device code */
 
 #if defined(__MINGW32__)
 
diff --git a/contrib/win32/win32compat/includes/sys/param.h b/contrib/win32/win32compat/includes/sys/param.h
index 38a67ea..e1beba6 100644
--- a/contrib/win32/win32compat/includes/sys/param.h
+++ b/contrib/win32/win32compat/includes/sys/param.h
@@ -2,5 +2,12 @@
 #define COMPAT_PARAM_H 1
 
 /* Compatibility header to avoid lots of #ifdef _WIN32's in includes.h */
+typedef unsigned int uid_t;
+typedef unsigned int gid_t;
+typedef long _off_t;
+typedef long off_t;
+typedef unsigned int _dev_t;
+typedef unsigned int dev_t;
+
 
 #endif
diff --git a/contrib/win32/win32compat/signal.c b/contrib/win32/win32compat/signal.c
index 0a9d314..7a495fb 100644
--- a/contrib/win32/win32compat/signal.c
+++ b/contrib/win32/win32compat/signal.c
@@ -48,7 +48,6 @@ static VOID CALLBACK
 sigint_APCProc(
 	_In_ ULONG_PTR dwParam
 	) {
-	pending_signals |= W32_SIGINT;
 	sigaddset(&pending_signals, W32_SIGINT);
 }
 
@@ -65,7 +64,8 @@ void
 sw_init_signal_handler_table() {
 	int i;
 
-	signal(SIGINT, sigint_APCProc);
+	/* TODO SetConsoleCtrlHandler */
+	//signal(SIGINT, native_sig_handler);
 	sigemptyset(&pending_signals);
 	memset(&signal_info, 0, sizeof(signal_info));
 	for (i = 0; i < W32_SIGMAX; i++) {