eliminate extra startup file i/o
git-svn-id: svn://10.0.0.236/trunk@35714 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
9d8448f9db
commit
a59404197c
@ -3894,7 +3894,6 @@ extern XP_Bool bGlobalRegistry;
|
||||
VR_INTERFACE(REGERR) NR_StartupRegistry(void)
|
||||
{
|
||||
REGERR status = REGERR_OK;
|
||||
HREG reg;
|
||||
|
||||
#ifndef STANDALONE_REGISTRY
|
||||
if ( reglist_lock == NULL ) {
|
||||
@ -3916,18 +3915,10 @@ VR_INTERFACE(REGERR) NR_StartupRegistry(void)
|
||||
if ( regStartCount == 1 )
|
||||
{
|
||||
/* first time only initialization */
|
||||
|
||||
vr_findGlobalRegName();
|
||||
|
||||
/* check to see that we have a valid registry */
|
||||
/* or create one if it doesn't exist */
|
||||
if (REGERR_OK == nr_RegOpen("", ®))
|
||||
{
|
||||
nr_RegClose(reg);
|
||||
}
|
||||
|
||||
/* initialization for version registry */
|
||||
#ifndef STANDALONE_REGISTRY
|
||||
/* initialization for version registry */
|
||||
vr_lock = PR_NewLock();
|
||||
XP_ASSERT( vr_lock != NULL );
|
||||
#ifdef XP_UNIX
|
||||
|
||||
@ -71,7 +71,7 @@ LIBRARY=$(OBJDIR)\$(LIBNAME)_s.lib
|
||||
#//
|
||||
#//------------------------------------------------------------------------
|
||||
|
||||
LCFLAGS = -DSTANDALONE_REGISTRY
|
||||
LCFLAGS = $(LCFLAGS) -DSTANDALONE_REGISTRY
|
||||
|
||||
LINCS= $(LINCS) -I$(PUBLIC)/libreg \
|
||||
$(NULL)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user