merge from OJI_19980430_BRANCH OJI_19980528_TEMP_BRANCH
authorjgellman
Sun, 31 May 1998 18:13:33 +0000
branchOJI_19980528_TEMP_BRANCH
changeset 137 1824173391cc2a546dc311336faa758447f34941
parent 135 52c4ea758626c2d8fb37f314392068540403607e
child 139 052aef3a3b9adba68b9297847da8d4e06373e130
push idunknown
push userunknown
push dateunknown
merge from OJI_19980430_BRANCH
config/UNIX.mk
pr/include/prmem.h
--- 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