Changeset: e91e43813c49 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e91e43813c49
Modified Files:
MonetDB/src/gdk/gdk_utils.mx
MonetDB4/configure.ag
MonetDB4/src/modules/plain/alarm.mx
MonetDB5/configure.ag
MonetDB5/src/modules/kernel/alarm.mx
buildtools/conf/MonetDB.m4
buildtools/conf/winconfig.h
pathfinder/compiler/compile.c
pathfinder/compiler/main.c
pathfinder/compiler/main_opt.c
pathfinder/compiler/main_sql.c
pathfinder/compiler/pf_ferry.c
pathfinder/configure.ag
Branch: default
Log Message:
configure cleanup:
It's (ancient) history that signal handlers return anything other
than void.
diffs (179 lines):
diff -r f832603344fb -r e91e43813c49 MonetDB/src/gdk/gdk_utils.mx
--- a/MonetDB/src/gdk/gdk_utils.mx Wed Nov 24 14:36:27 2010 +0100
+++ b/MonetDB/src/gdk/gdk_utils.mx Wed Nov 24 16:28:40 2010 +0100
@@ -277,7 +277,7 @@
@c
#include <signal.h>
#if 0 /* these are unused */
-static RETSIGTYPE
+static void
BATSIGignore(int nr)
{
GDKsyserror("! ERROR signal %d caught by thread " SZFMT "\n", nr,
(size_t) MT_getpid());
@@ -285,7 +285,7 @@
#endif
#ifdef WIN32
-static RETSIGTYPE
+static void
BATSIGabort(int nr)
{
GDKfatal("BATSIGabort: signal %d caught by thread " SZFMT "\n", nr,
(size_t) MT_getpid());
@@ -293,14 +293,14 @@
#endif
#ifndef NATIVE_WIN32
-static RETSIGTYPE
+static void
BATSIGinterrupt(int nr)
{
GDKexit(nr);
}
#ifdef SIGCHLD
-static RETSIGTYPE
+static void
BATSIGchild(int nr)
{
int status;
diff -r f832603344fb -r e91e43813c49 MonetDB4/configure.ag
--- a/MonetDB4/configure.ag Wed Nov 24 14:36:27 2010 +0100
+++ b/MonetDB4/configure.ag Wed Nov 24 16:28:40 2010 +0100
@@ -310,7 +310,6 @@
if test x$cross_compiling != xyes; then
AC_FUNC_SETPGRP()
fi
-AC_TYPE_SIGNAL()
AC_FUNC_VPRINTF()
AC_FUNC_MEMCMP()
AC_CHECK_FUNCS(strsignal)
diff -r f832603344fb -r e91e43813c49 MonetDB4/src/modules/plain/alarm.mx
--- a/MonetDB4/src/modules/plain/alarm.mx Wed Nov 24 14:36:27 2010 +0100
+++ b/MonetDB4/src/modules/plain/alarm.mx Wed Nov 24 16:28:40 2010 +0100
@@ -141,7 +141,7 @@
#undef SIG_ERR /*((__sighandler_t)-1 ) */
#define SIG_ERR ((__sighandler_t)-1L)
#endif
-static RETSIGTYPE
+static void
CLKsignal(int nr)
{
int restype;
diff -r f832603344fb -r e91e43813c49 MonetDB5/configure.ag
--- a/MonetDB5/configure.ag Wed Nov 24 14:36:27 2010 +0100
+++ b/MonetDB5/configure.ag Wed Nov 24 16:28:40 2010 +0100
@@ -102,7 +102,6 @@
dnl src/modules/mal/mal_mapi.mx does UNIX domain socket handling
AM_MONETDB_MSG_CONTROL()
AM_ICONV()
-AC_TYPE_SIGNAL() #RETSIGTYPE
req_pcre_ver='4.5'
PKG_CHECK_MODULES([pcre], [libpcre >= $req_pcre_ver])
diff -r f832603344fb -r e91e43813c49 MonetDB5/src/modules/kernel/alarm.mx
--- a/MonetDB5/src/modules/kernel/alarm.mx Wed Nov 24 14:36:27 2010 +0100
+++ b/MonetDB5/src/modules/kernel/alarm.mx Wed Nov 24 16:28:40 2010 +0100
@@ -172,7 +172,7 @@
#undef SIG_ERR /*((__sighandler_t)-1 ) */
#define SIG_ERR ((__sighandler_t)-1L)
#endif
-static RETSIGTYPE
+static void
CLKsignal(int nr)
{
/* int restype; */
diff -r f832603344fb -r e91e43813c49 buildtools/conf/MonetDB.m4
--- a/buildtools/conf/MonetDB.m4 Wed Nov 24 14:36:27 2010 +0100
+++ b/buildtools/conf/MonetDB.m4 Wed Nov 24 16:28:40 2010 +0100
@@ -1665,7 +1665,6 @@
# Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
-AC_TYPE_SIGNAL()
AM_MONETDB_TYPES()
# Checks for library functions.
diff -r f832603344fb -r e91e43813c49 buildtools/conf/winconfig.h
--- a/buildtools/conf/winconfig.h Wed Nov 24 14:36:27 2010 +0100
+++ b/buildtools/conf/winconfig.h Wed Nov 24 16:28:40 2010 +0100
@@ -649,9 +649,6 @@
/* Compiler flag */
/* #undef PROFILE */
-/* Define as the return type of signal handlers (`int' or `void'). */
-#define RETSIGTYPE void
-
/* Define to 1 if the `setpgrp' function takes no argument. */
/* #undef SETPGRP_VOID */
diff -r f832603344fb -r e91e43813c49 pathfinder/compiler/compile.c
--- a/pathfinder/compiler/compile.c Wed Nov 24 14:36:27 2010 +0100
+++ b/pathfinder/compiler/compile.c Wed Nov 24 16:28:40 2010 +0100
@@ -1142,7 +1142,7 @@
*
* It will print out some informative message and then terminate the program.
*/
-RETSIGTYPE
+void
segfault_handler (int sig)
{
fprintf (stderr,
diff -r f832603344fb -r e91e43813c49 pathfinder/compiler/main.c
--- a/pathfinder/compiler/main.c Wed Nov 24 14:36:27 2010 +0100
+++ b/pathfinder/compiler/main.c Wed Nov 24 16:28:40 2010 +0100
@@ -597,7 +597,7 @@
#ifdef WIN32
#include <signal.h>
-static RETSIGTYPE
+static void
catchabort(int sig)
{
(void) sig;
diff -r f832603344fb -r e91e43813c49 pathfinder/compiler/main_opt.c
--- a/pathfinder/compiler/main_opt.c Wed Nov 24 14:36:27 2010 +0100
+++ b/pathfinder/compiler/main_opt.c Wed Nov 24 16:28:40 2010 +0100
@@ -142,7 +142,7 @@
*
* It will print out some informative message and then terminate the program.
*/
-RETSIGTYPE
+void
segfault_handler (int sig)
{
fprintf (stderr,
diff -r f832603344fb -r e91e43813c49 pathfinder/compiler/main_sql.c
--- a/pathfinder/compiler/main_sql.c Wed Nov 24 14:36:27 2010 +0100
+++ b/pathfinder/compiler/main_sql.c Wed Nov 24 16:28:40 2010 +0100
@@ -140,7 +140,7 @@
*
* It will print out some informative message and then terminate the program.
*/
-RETSIGTYPE
+void
segfault_handler (int sig)
{
fprintf (stderr,
diff -r f832603344fb -r e91e43813c49 pathfinder/compiler/pf_ferry.c
--- a/pathfinder/compiler/pf_ferry.c Wed Nov 24 14:36:27 2010 +0100
+++ b/pathfinder/compiler/pf_ferry.c Wed Nov 24 16:28:40 2010 +0100
@@ -63,7 +63,7 @@
*
* It will print out some informative message and then terminate the program.
*/
-RETSIGTYPE
+void
segfault_handler (int sig)
{
fprintf (stderr,
diff -r f832603344fb -r e91e43813c49 pathfinder/configure.ag
--- a/pathfinder/configure.ag Wed Nov 24 14:36:27 2010 +0100
+++ b/pathfinder/configure.ag Wed Nov 24 16:28:40 2010 +0100
@@ -324,7 +324,6 @@
dnl We use signal handlers to catch segmentation faults and
dnl give helpful messages to the user, if available.
AC_CHECK_HEADERS(signal.h)
-AC_TYPE_SIGNAL
dnl Convenience feature: Make argument of --debug case insensitive
dnl if we have strcasecmp().
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
