Change 33084 by [EMAIL PROTECTED] on 2008/01/28 10:07:48
Subject: [PATCH] ext/IPC/SysV/SysV.xs [Re: [Fwd: Smoke [5.11.0] 33016
FAIL(XM)
From: Jarkko Hietaniemi <[EMAIL PROTECTED]>
Date: Sun, 27 Jan 2008 20:44:46 -0500
Message-ID: <[EMAIL PROTECTED]>
Affected files ...
... //depot/perl/ext/IPC/SysV/SysV.xs#24 edit
Differences ...
==== //depot/perl/ext/IPC/SysV/SysV.xs#24 (text) ====
Index: perl/ext/IPC/SysV/SysV.xs
--- perl/ext/IPC/SysV/SysV.xs#23~33041~ 2008-01-22 17:21:24.000000000 -0800
+++ perl/ext/IPC/SysV/SysV.xs 2008-01-28 02:07:48.000000000 -0800
@@ -332,8 +332,16 @@
croak("invalid project id");
}
}
-
- k = ftok(path, proj_id);
+/* Including <sys/types.h> before <sys/ipc.h> makes Tru64
+ * to see the obsolete prototype of ftok() first, grumble. */
+# ifdef __osf__
+# define Ftok_t char*
+/* Configure TODO Ftok_t */
+# endif
+# ifndef Ftok_t
+# define Ftok_t const char*
+# endif
+ k = ftok((Ftok_t)path, proj_id);
ST(0) = k == (key_t) -1 ? &PL_sv_undef : sv_2mortal(newSViv(k));
XSRETURN(1);
#else
@@ -405,11 +413,7 @@
CODE:
#ifdef HAS_SHM
void *caddr = sv2addr(addr);
-# ifdef __SUNPRO_CC
- int rv = shmdt((char *)caddr);
-# else
- int rv = shmdt(caddr);
-# endif
+ int rv = shmdt((Shmat_t)caddr);
ST(0) = rv == -1 ? &PL_sv_undef : sv_2mortal(newSViv(rv));
XSRETURN(1);
#else
End of Patch.
