Change 13798 by jhi@alpha on 2001/12/19 13:35:59
Integrate with perlio.
Affected files ...
.... //depot/perl/hv.c#95 integrate
.... //depot/perl/hv.h#26 integrate
.... //depot/perl/scope.c#87 integrate
.... //depot/perl/util.c#304 integrate
Differences ...
==== //depot/perl/hv.c#95 (text) ====
Index: perl/hv.c
--- perl/hv.c.~1~ Wed Dec 19 06:45:06 2001
+++ perl/hv.c Wed Dec 19 06:45:06 2001
@@ -768,9 +768,6 @@
Perl_hv_notallowed(aTHX_ is_utf8, key, klen, keysave);
}
- *oentry = HeNEXT(entry);
- if (i && !*oentry)
- xhv->xhv_fill--; /* HvFILL(hv)-- */
if (flags & G_DISCARD)
sv = Nullsv;
else {
@@ -790,6 +787,9 @@
* doesn't go down, but the number placeholders goes up */
xhv->xhv_placeholders++; /* HvPLACEHOLDERS(hv)++ */
} else {
+ *oentry = HeNEXT(entry);
+ if (i && !*oentry)
+ xhv->xhv_fill--; /* HvFILL(hv)-- */
if (entry == xhv->xhv_eiter /* HvEITER(hv) */)
HvLAZYDEL_on(hv);
else
@@ -911,9 +911,6 @@
Perl_hv_notallowed(aTHX_ is_utf8, key, klen, keysave);
}
- *oentry = HeNEXT(entry);
- if (i && !*oentry)
- xhv->xhv_fill--; /* HvFILL(hv)-- */
if (flags & G_DISCARD)
sv = Nullsv;
else {
@@ -933,6 +930,9 @@
* doesn't go down, but the number placeholders goes up */
xhv->xhv_placeholders++; /* HvPLACEHOLDERS(hv)++ */
} else {
+ *oentry = HeNEXT(entry);
+ if (i && !*oentry)
+ xhv->xhv_fill--; /* HvFILL(hv)-- */
if (entry == xhv->xhv_eiter /* HvEITER(hv) */)
HvLAZYDEL_on(hv);
else
==== //depot/perl/hv.h#26 (text) ====
Index: perl/hv.h
--- perl/hv.h.~1~ Wed Dec 19 06:45:06 2001
+++ perl/hv.h Wed Dec 19 06:45:06 2001
@@ -136,7 +136,7 @@
#define XHvTOTALKEYS(xhv) ((xhv)->xhv_keys)
/* The number of placeholders in the enumerated-keys hash */
-#define XHvPLACEHOLDERS(xhv) ((IV)((xhv)->xhv_placeholders))
+#define XHvPLACEHOLDERS(xhv) ((xhv)->xhv_placeholders)
/* the number of keys that exist() (i.e. excluding placeholers) */
#define XHvUSEDKEYS(xhv) (XHvTOTALKEYS(xhv) - XHvPLACEHOLDERS(xhv))
==== //depot/perl/scope.c#87 (text) ====
Index: perl/scope.c
--- perl/scope.c.~1~ Wed Dec 19 06:45:06 2001
+++ perl/scope.c Wed Dec 19 06:45:06 2001
@@ -827,9 +827,8 @@
* if a my variable that was made readonly is going out of
* scope, we want to remove the readonlyness so that it can
* go out of scope quietly
- * Disabled as I don't see need yet NI-S 2001/12/18
*/
- if (0 && SvPADMY(sv) && ! SvFAKE(sv))
+ if (SvPADMY(sv) && !SvFAKE(sv))
SvREADONLY_off(sv);
if (SvTHINKFIRST(sv))
==== //depot/perl/util.c#304 (text) ====
Index: perl/util.c
--- perl/util.c.~1~ Wed Dec 19 06:45:06 2001
+++ perl/util.c Wed Dec 19 06:45:06 2001
@@ -2255,7 +2255,7 @@
sigemptyset(&act.sa_mask);
act.sa_flags = 0;
#ifdef SA_RESTART
-#if !defined(USE_PERLIO) || defined(PERL_OLD_SIGNALS)
+#if defined(PERL_OLD_SIGNALS)
act.sa_flags |= SA_RESTART; /* SVR4, 4.3+BSD */
#endif
#endif
@@ -2289,7 +2289,7 @@
sigemptyset(&act.sa_mask);
act.sa_flags = 0;
#ifdef SA_RESTART
-#if !defined(USE_PERLIO) || defined(PERL_OLD_SIGNALS)
+#if defined(PERL_OLD_SIGNALS)
act.sa_flags |= SA_RESTART; /* SVR4, 4.3+BSD */
#endif
#endif
End of Patch.
