Update of /cvsroot/monetdb/sql/src/backends/monet5/merovingian
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26525
Modified Files:
merovingian_handlers.c
Log Message:
avoid conflict with Solaris' built in sig2str (which does the same)
Index: merovingian_handlers.c
===================================================================
RCS file:
/cvsroot/monetdb/sql/src/backends/monet5/merovingian/merovingian_handlers.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- merovingian_handlers.c 23 Mar 2010 14:03:46 -0000 1.3
+++ merovingian_handlers.c 23 Mar 2010 14:11:33 -0000 1.4
@@ -25,7 +25,7 @@
static char *sigsegv = "SIGSEGV";
static char *sigkill = "SIGKILL";
static char *
-sig2str(int sig)
+sigtostr(int sig)
{
switch (sig) {
case SIGINT:
@@ -54,7 +54,7 @@
static void
handler(int sig)
{
- char *signame = sig2str(sig);
+ char *signame = sigtostr(sig);
if (signame == NULL) {
Mfprintf(stdout, "caught signal %d, starting shutdown
sequence\n", sig);
} else {
@@ -183,7 +183,7 @@
"exit status %d\n", p->dbname,
(long long int)p->pid,
si->si_status);
} else if (si->si_code == CLD_KILLED) {
- char *sigstr = sig2str(si->si_status);
+ char *sigstr = sigtostr(si->si_status);
if (sigstr == NULL) {
sigstr = alloca(sizeof(char) * 8);
snprintf(sigstr, 8, "%d",
si->si_status);
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
