NO_NSPR_PRIVATE_HEADER_BRANCH landing. Removed the inclusions of

private NSPR headers (prosdep.h and primpl.h) from the Mozilla source.
The part of prosdep.h that is actually needed by Mozilla was extracted
and put in the new file mozilla/include/xp_path.h.


git-svn-id: svn://10.0.0.236/trunk@10691 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/modules/libreg/src/VerReg.c

@@ -31,7 +31,6 @@
  * --------------------------------------------------------------------
  */
 #include <fcntl.h>
-#include <errno.h>
 
 #if defined(XP_WIN)
 #include <io.h>
@@ -39,7 +38,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <assert.h>
 
 #include "reg.h"
@@ -354,7 +352,9 @@ static REGERR vr_GetCheck(char *path, int32 *check)
 			return REGERR_NOFILE;
 
 		case EACCES:	/* file in use */
+#ifdef EMFILE  /* Mac doesn't have EMFILE. */
 		case EMFILE:	/* too many files open */
+#endif
 		default:
 			return REGERR_FAIL;
 		}

mozilla/modules/libreg/src/reg.c

@@ -41,9 +41,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include <string.h>
 #include <assert.h>
-#include <errno.h>
 
 #ifdef SUNOS4
   #include <unistd.h>  /* for SEEK_SET */
@@ -56,6 +54,10 @@
 #ifndef MAX_PATH
 #define MAX_PATH 1024
 #endif
+#elif defined(WIN32)
+#include <windef.h>  /* for MAX_PATH */
+#elif defined(XP_MAC)
+#define MAX_PATH 512
 #endif
 
 
@@ -206,7 +208,9 @@ static REGERR nr_OpenFile(char *path, FILEHANDLE *fh)
             else
                 return REGERR_FAIL;
                 
+#ifdef EMFILE  /* Mac doesn't have EMFILE. */
 		case EMFILE:	/* too many files open */
+#endif
 		default:
 			return REGERR_FAIL;
 		}

mozilla/modules/libreg/src/vr_stubs.c

@@ -21,7 +21,6 @@
  */
 
 #include <stdio.h>
-#include <string.h>
 
 #ifndef STANDALONE_REGISTRY
 #include "prtypes.h"

mozilla/modules/libreg/src/vr_stubs.h

@@ -25,6 +25,10 @@
 #define _VR_STUBS_H_
 
 #include <errno.h>
+#include <string.h>
+#ifdef XP_MAC
+#include "macstdlibextras.h"  /* For strcasecmp and strncasecmp */
+#endif
 
 #ifdef XP_MAC
 #include <stat.h>