merge from OJI branch
authorjgellman
Wed, 03 Jun 1998 00:37:07 +0000
changeset 140 896094396c6f5fcba58b52dab83eea743de7537c
parent 138 dc980a7b3eb0500171461e14c5e79036642ec12e
child 141 b69ecbde5c1d3001a9a9481971a9bc761f02a9d8
push idunknown
push userunknown
push dateunknown
merge from OJI branch
config/UNIX.mk
pr/include/prmem.h
pr/src/linking/prlink.c
--- a/config/UNIX.mk
+++ b/config/UNIX.mk
@@ -27,17 +27,17 @@ DEFINES		= -UDEBUG -DNDEBUG
 OBJDIR_TAG	= _OPT
 else
 OPTIMIZER	= -g
 DEFINES		= -DDEBUG -UNDEBUG -DDEBUG_$(shell whoami)
 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
 MKDEPENDENCIES  = $(OBJDIR)/depend.mk
 
 ####################################################################
 #
 # One can define the makefile variable NSDISTMODE to control
--- a/pr/include/prmem.h
+++ b/pr/include/prmem.h
@@ -116,17 +116,17 @@ PR_EXTERN(void) PR_Free(void *ptr);
 ** FUNCTION:	PR_DELETE()
 ** DESCRIPTION:
 **   PR_DELETE() unallocates an object previosly allocated via PR_NEW()
 **   or PR_NEWZAP() to the heap.
 ** INPUTS:	pointer to previously allocated object
 ** 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()
 ** DESCRIPTION:
 **   PR_FREEIF() conditionally unallocates an object previously allocated
 **   vial PR_NEW() or PR_NEWZAP(). If the pointer to the object is
 **   equal to zero (0), the object is not released.
 ** INPUTS:	pointer to previously allocated object
--- a/pr/src/linking/prlink.c
+++ b/pr/src/linking/prlink.c
@@ -98,16 +98,18 @@ static void DLLErrorInternal(PRIntn oser
 ** but will eventually come up with the right answer.
 */
 {
     const char *error = NULL;
 #ifdef USE_DLFCN
     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
     if (NULL != error)
         PR_SetErrorText(strlen(error), error);
 }  /* DLLErrorInternal */
 
 void _PR_InitLinker(void)