r=brendan

a=brendan
bug: 27362

This fix makes it so nsCLiveconnect.cpp doesn't #include
files within an extern "C" {} block.  To make this work, I
simply moved the extern "C" {} to the minimum necessary
range.  This required placing an "ifdef __cplusplus extern "C""
block in jsj_private.h, since nsCLiveconnect.cpp is the only
c++ file that includes jsj_private.h.

js/src/liveconnect/jsj_private.h

@@ -86,6 +86,13 @@ extern char* strdup(const char* str);
 #    endif
 #endif
 
+// This file doesn't include prtypes.h, which defines PR_BEGIN_EXTERN_C,
+// and I certainly don't want to pull it in to such a high level include
+// file, so I'll just do what prtypes.h does. edburns 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*************************** Type Declarations ******************************/
 
 /* Forward type declarations */
@@ -645,4 +652,9 @@ enum JSJErrNum {
 #undef MSGDEF
 };
 
+#ifdef __cplusplus
+} 
+// end extern "C"
+#endif
+
 #endif   /* _JSJAVA_PVT_H */

js/src/liveconnect/nsCLiveconnect.cpp

@@ -44,7 +44,6 @@
 #include "prtypes.h"
 #include "prprf.h"
 #include "prlog.h"
-PR_BEGIN_EXTERN_C
 
 #include "jsj_private.h"
 #include "jsjava.h"
@@ -55,6 +54,8 @@ PR_BEGIN_EXTERN_C
 #include "netscape_javascript_JSObject.h"   /* javah-generated headers */
 #include "nsISecurityContext.h"
 
+PR_BEGIN_EXTERN_C
+
 /* A captured JavaScript error, created when JS_ReportError() is called while
    running JavaScript code that is itself called from Java. */
 struct CapturedJSError {