5 files changed, 19 insertions, 9 deletions
diff --git a/lib/config-mac.h b/lib/config-mac.h
index c37610213..1db255009 100644
--- a/lib/config-mac.h
+++ b/lib/config-mac.h
@@ -47,6 +47,8 @@
 
 #define HAVE_FIONBIO            1
 
+#define RETSIGTYPE void
+
 #define HAVE_GETNAMEINFO 1
 #define GETNAMEINFO_QUAL_ARG1 const
 #define GETNAMEINFO_TYPE_ARG1 struct sockaddr *
diff --git a/lib/config-win32.h b/lib/config-win32.h
index 3fd08f5bf..443be95e6 100644
--- a/lib/config-win32.h
+++ b/lib/config-win32.h
@@ -294,7 +294,7 @@
 #define in_addr_t unsigned long
 
 /* Define as the return type of signal handlers (int or void).  */
-/* #define RETSIGTYPE void */
+#define RETSIGTYPE void
 
 #if (defined(__WATCOMC__) && (__WATCOMC__ >= 1240)) || defined(__POCC__)
 #elif defined(_WIN64)
diff --git a/lib/config-win32ce.h b/lib/config-win32ce.h
index fc516f264..fc038aad9 100644
--- a/lib/config-win32ce.h
+++ b/lib/config-win32ce.h
@@ -278,13 +278,15 @@
 #define in_addr_t unsigned long
 
 /* Define as the return type of signal handlers (int or void).  */
-/* #define RETSIGTYPE void */
+#define RETSIGTYPE void
 
-/* Define to `unsigned' if size_t is not an available 'typedefed' type */
-/* #define size_t unsigned */
-
-/* Define to 'int' if ssize_t is not an available 'typedefed' type */
+/* Define ssize_t if it is not an available 'typedefed' type */
+#if (defined(__WATCOMC__) && (__WATCOMC__ >= 1240)) || defined(__POCC__)
+#elif defined(_WIN64)
+#define ssize_t __int64
+#else
 #define ssize_t int
+#endif
 
 /* Define to 'int' if socklen_t is not an available 'typedefed' type */
 #ifndef HAVE_WS2TCPIP_H
diff --git a/lib/setup_once.h b/lib/setup_once.h
index 07909475c..9f36995eb 100644
--- a/lib/setup_once.h
+++ b/lib/setup_once.h
@@ -140,5 +140,14 @@ typedef int sig_atomic_t;
 #endif
 
 
+/*
+ * Default return type for signal handlers.
+ */
+
+#ifndef RETSIGTYPE
+#define RETSIGTYPE void
+#endif
+
+
 #endif /* __SETUP_ONCE_H */
 
diff --git a/lib/url.c b/lib/url.c
index b7f06cc5b..bf67b9c1b 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -179,9 +179,6 @@ static void signalPipeClose(struct curl_llist *pipe);
 #ifndef WIN32
 /* not for WIN32 builds */
 
-#ifndef RETSIGTYPE
-#define RETSIGTYPE void
-#endif
 #ifdef HAVE_SIGSETJMP
 extern sigjmp_buf curl_jmpenv;
 #endif