diff options
| author | jgellman <devnull@localhost> | 1998-06-03 00:37:07 +0000 |
|---|---|---|
| committer | jgellman <devnull@localhost> | 1998-06-03 00:37:07 +0000 |
| commit | 2c864e75e12ea1c779cb447386c32b27852c6654 (patch) | |
| tree | bc210c3ad0676cfbdec691523a1308b02d3af57d | |
| parent | 7757d0c2020152b5d2a10020da897ad8f1e8fb00 (diff) | |
| download | nspr-hg-2c864e75e12ea1c779cb447386c32b27852c6654.tar.gz | |
merge from OJI branch
| -rw-r--r-- | config/UNIX.mk | 2 | ||||
| -rw-r--r-- | pr/include/prmem.h | 2 | ||||
| -rw-r--r-- | pr/src/linking/prlink.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/config/UNIX.mk b/config/UNIX.mk index ad45ddb1..2e79655c 100644 --- a/config/UNIX.mk +++ b/config/UNIX.mk @@ -32,7 +32,7 @@ OBJDIR_TAG = _DBG endif # Name of the binary code directories -OBJDIR_NAME = $(OS_CONFIG)$(CPU_ARCH_TAG)$(COMPILER_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJ +OBJDIR_NAME = SunOS5.5.1_sparc_DBG.OBJ MKDEPEND_DIR = $(DEPTH)/config/mkdepend MKDEPEND = $(MKDEPEND_DIR)/$(OBJDIR_NAME)/mkdepend diff --git a/pr/include/prmem.h b/pr/include/prmem.h index dc88f755..e2b88f82 100644 --- a/pr/include/prmem.h +++ b/pr/include/prmem.h @@ -121,7 +121,7 @@ PR_EXTERN(void) PR_Free(void *ptr); ** OUTPUTS: the referenced object is returned to the heap ** RETURN: void ***********************************************************************/ -#define PR_DELETE(_ptr) { PR_Free(_ptr); (_ptr) = NULL; } +#define PR_DELETE(_ptr) { PR_Free((void*)_ptr); (_ptr) = NULL; } /*********************************************************************** ** FUNCTION: PR_FREEIF() diff --git a/pr/src/linking/prlink.c b/pr/src/linking/prlink.c index 93f0b45a..61edcad1 100644 --- a/pr/src/linking/prlink.c +++ b/pr/src/linking/prlink.c @@ -103,6 +103,8 @@ static void DLLErrorInternal(PRIntn oserr) error = dlerror(); /* $$$ That'll be wrong some of the time - AOF */ #elif defined(HAVE_STRERROR) error = strerror(oserr); /* this should be okay */ +#elif defined(XP_PC) + error = errno_string(GetLastError()); #else error = errno_string(oserr); #endif |