From: Gurusamy Sarathy <gsar@cpan.org>
Date: Tue, 28 Dec 1999 04:18:15 +0000 (+0000)
Subject: integrate utfperl contents into mainline
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=032d67713d2e36a6571c50a168530560ac8acea3;p=p5sagit%2Fp5-mst-13.2.git

integrate utfperl contents into mainline

p4raw-id: //depot/perl@4726
---

032d67713d2e36a6571c50a168530560ac8acea3
diff --cc perl.h
index fb5409d,2bba6d4..98c6265
--- a/perl.h
+++ b/perl.h
@@@ -1470,10 -1470,10 +1470,6 @@@ typedef struct ptr_tbl PTR_TBL_t
  #  define PERL_SYS_INIT3(argvp,argcp,envp) PERL_SYS_INIT(argvp,argcp)
  #endif
  
--#ifndef PERL_SYS_INIT3
--#  define PERL_SYS_INIT3(argvp,argcp,envp) PERL_SYS_INIT(argvp,argcp)
--#endif
--
  #ifndef MAXPATHLEN
  #  ifdef PATH_MAX
  #    ifdef _POSIX_PATH_MAX
diff --cc sv.h
index e9d6893,1374c87..b6e819f
--- a/sv.h
+++ b/sv.h
@@@ -155,6 -158,6 +158,8 @@@ struct io 
  
  #define SVpad_OUR	0x80000000	/* pad name is "our" instead of "my" */
  
++#define SVpad_OUR	0x80000000	/* pad name is "our" instead of "my" */
++
  #define SVf_IVisUV	0x80000000	/* use XPVUV instead of XPVIV */
  
  #define SVpfm_COMPILED	0x80000000	/* FORMLINE is compiled */