Integrate mainline

[p5sagit/p5-mst-13.2.git] / perl.c

diff --git a/perl.c b/perl.c
index ef3e205..9e8d5ea 100644 (file)
--- a/perl.c
+++ b/perl.c
@@ -943,8 +943,8 @@ setuid perl scripts securely.\n");
         * --jhi */
         char *s;
         int i;
-        int mask =
-          ~(PTRSIZE == 4 ? 3 : PTRSIZE == 8 ? 7 : PTRSIZE == 16 ? 15 : 0);
+        UV mask =
+          ~(UV)(PTRSIZE == 4 ? 3 : PTRSIZE == 8 ? 7 : PTRSIZE == 16 ? 15 : 0);
 
         /* See if all the arguments are contiguous in memory.
          * Note that 'contiguous' is a loose term because some
@@ -3405,6 +3405,7 @@ S_init_ids(pTHX)
 bool
 Perl_doing_taint(int argc, char *argv[], char *envp[])
 {
+    dTHX;
     int uid  = PerlProc_getuid();
     int euid = PerlProc_geteuid();
     int gid  = PerlProc_getgid();