Fixing libreg threadsafe issues (NR_ API, not yet the version registry API)

modules/libreg/include/NSReg.h

@@ -136,11 +136,11 @@ VR_INTERFACE(REGERR) NR_RegPack(
        );
 
 VR_INTERFACE(REGERR) NR_RegGetUsername(
-	    char **name        /* on return, an alloc'ed copy of the current user name */
+         char **name        /* on return, an alloc'ed copy of the current user name */
        );
 
 VR_INTERFACE(REGERR) NR_RegSetUsername(
-	 const char *name  /* name of current user */
+         const char *name  /* name of current user */
        );
 
 /* ---------------------------------------------------------------------
@@ -257,8 +257,8 @@ VR_INTERFACE(REGERR) NR_RegEnumEntries(
        );
 
 
-VR_INTERFACE(void) NR_ShutdownRegistry(void);
+VR_INTERFACE(void)      NR_ShutdownRegistry(void);
-VR_INTERFACE(void) NR_StartupRegistry(void);
+VR_INTERFACE(REGERR)    NR_StartupRegistry(void);
 
 
 XP_END_PROTOS

modules/libreg/src/reg.h

@@ -26,6 +26,7 @@
 
 #ifndef STANDALONE_REGISTRY
 #include "prmon.h"
+#include "prlock.h"
 #endif
 
 /* --------------------------------------------------------------------
@@ -156,7 +157,7 @@ typedef struct _regfile
     struct _regfile *next;
     struct _regfile *prev;
 #ifndef STANDALONE_REGISTRY
-    PRMonitor       *monitor;
+    PRLock          *lock;
 #endif
 } REGFILE;
 

modules/libreg/src/vr_stubs.h

@@ -113,6 +113,9 @@
 #define XP_MEMCPY(d, s, l)	memcpy((d), (s), (l))
 #define XP_MEMSET(d, c, l)  memset((d), (c), (l))
 
+#define PR_Lock(a)          ((void)0)
+#define PR_Unlock(a)        ((void)0)
+
 #ifdef XP_PC
   #define XP_STRCASECMP(x,y)  stricmp((x),(y))
   #define XP_STRNCASECMP(x,y,n) strnicmp((x),(y),(n))