summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJarkko Hietaniemi <jhi@iki.fi>2001-10-24 23:16:21 +0000
committerJarkko Hietaniemi <jhi@iki.fi>2001-10-24 23:16:21 +0000
commitc8c3aaef485e8175be70a158d82780a1bb4ae60b (patch)
tree6534638f08edc43a93289231c02d5a8942e78f0e
parentb48e37451f28656e04b70fcad4d165ae76f34688 (diff)
downloadperl-c8c3aaef485e8175be70a158d82780a1bb4ae60b.tar.gz
Upgrade NetWare and WinCE as in #12626.
p4raw-id: //depot/perl@12629
-rw-r--r--NetWare/dl_netware.xs3
-rw-r--r--wince/dl_win32.xs27
2 files changed, 19 insertions, 11 deletions
diff --git a/NetWare/dl_netware.xs b/NetWare/dl_netware.xs
index 11f2444ab2..766ceb8ffb 100644
--- a/NetWare/dl_netware.xs
+++ b/NetWare/dl_netware.xs
@@ -181,7 +181,8 @@ dl_install_xsub(perl_name, symref, filename="$Package")
char *
dl_error()
CODE:
- RETVAL = LastError ;
+ dMY_CXT;
+ RETVAL = dl_last_error ;
OUTPUT:
RETVAL
diff --git a/wince/dl_win32.xs b/wince/dl_win32.xs
index d93d9dda64..64dc731c6b 100644
--- a/wince/dl_win32.xs
+++ b/wince/dl_win32.xs
@@ -32,21 +32,27 @@ calls.
#include "XSUB.h"
-static SV *error_sv;
+typedef struct {
+ SV * x_error_sv;
+} my_cxtx_t; /* this *must* be named my_cxtx_t */
+#define DL_CXT_EXTRA /* ask for dl_cxtx to be defined in dlutils.c */
+#include "dlutils.c" /* SaveError() etc */
+
+#define dl_error_sv (dl_cxtx.x_error_sv)
+
static char *
OS_Error_String(pTHX)
{
- DWORD err = GetLastError();
- STRLEN len;
- if (!error_sv)
- error_sv = newSVpvn("",0);
- PerlProc_GetOSError(error_sv,err);
- return SvPV(error_sv,len);
+ dMY_CXT;
+ DWORD err = GetLastError();
+ STRLEN len;
+ if (!dl_error_sv)
+ dl_error_sv = newSVpvn("",0);
+ PerlProc_GetOSError(dl_error_sv,err);
+ return SvPV(dl_error_sv,len);
}
-#include "dlutils.c" /* SaveError() etc */
-
static void
dl_private_init(pTHX)
{
@@ -157,7 +163,8 @@ dl_install_xsub(perl_name, symref, filename="$Package")
char *
dl_error()
CODE:
- RETVAL = LastError ;
+ dMY_CXT;
+ RETVAL = dl_last_error;
OUTPUT:
RETVAL