Initial (untested) integration of mainline changes.

p4raw-id: //depot/win32/perl@234

1 files changed, 9 insertions, 2 deletions

diff --git a/perl.h b/perl.h
index d8e69b67e5..dde502fd64 100644
--- a/perl.h
+++ b/perl.h
@@ -462,6 +462,14 @@ register struct op *op asm(stringify(OP_IN_REGISTER));
 #   define SETERRNO(errcode,vmserrcode) errno = (errcode)
 #endif
 
+#ifdef USE_THREADS
+#  define ERRSV (thr->errsv)
+#  define ERRHV (thr->errhv)
+#else
+#  define ERRSV GvSV(errgv)
+#  define ERRHV GvHV(errgv)
+#endif /* USE_THREADS */
+
 #ifndef errno
 	extern int errno;     /* ANSI allows errno to be an lvalue expr */
 #endif
@@ -1870,8 +1878,7 @@ IEXT I32	Imaxscream IINIT(-1);
 IEXT SV *	Ilastscream;
 
 /* shortcuts to misc objects */
-IEXT HV *	Ierrhv;
-IEXT SV *	Ierrsv;
+IEXT GV *	Ierrgv;
 
 /* shortcuts to debugging objects */
 IEXT GV *	IDBgv;