515628 - Make js*inlines.h self-contained, stop using JS_*_EXTERN_C in lib-private .h files

Status: RESOLVED FIXED

(Core :: JavaScript Engine, defect)

Description

[Brendan Eich [:brendan]]

Attachment: patch

Summary says it all. jsstrinlines.h was already nesting jsstr.h per Summary.

/be

Comment 1

[Brendan Eich [:brendan]]

Attachment: tested patch

Comment 2

[Brendan Eich [:brendan]]

Attachment: I've caught gal's wrong-patch-attached cold

Comment 3

[Jason Orendorff [:jorendorff]]

Comment on attachment 399756 [details] [diff] [review]
I've caught gal's wrong-patch-attached cold

>--- a/js/src/jsatominlines.h
> static inline JSBool
> js_ValueToStringId(JSContext *cx, jsval v, jsid *idp)

Remove "static" here, since we're making this file unsafe for C?

>--- a/js/src/jsscript.cpp
>+++ b/js/src/jsscript.cpp
> #include "jsscript.h"
>+#include "jsscriptinlines.h"
> #include "jstracer.h"
> #if JS_HAS_XDR
> #include "jsxdrapi.h"
> #endif
> 
> #include "jsscriptinlines.h"
> 

Delete the last 2 lines here (my earlier emergency fix).

>diff --git a/js/src/jstracer.cpp b/js/src/jstracer.cpp
>--- a/js/src/jstracer.cpp
>+++ b/js/src/jstracer.cpp
>+#include "jsscriptinlines.h"
> #include "jsstaticcheck.h"
> #include "jstracer.h"
> #include "jsxml.h"
> 
> #include "jsatominlines.h"
> #include "jsscriptinlines.h"
> 

And here.

Comment 4

[Brendan Eich [:brendan]]

I like the segregated js*inlines.h includes, now that you point it out. Thanks:

http://hg.mozilla.org/tracemonkey/rev/390977f2943c

/be

Comment 5

[Blake Kaplan (:mrbkap) (inactive)]

http://hg.mozilla.org/mozilla-central/rev/2e775a15b8c0

Comment 6

[Robert Sayre]

http://hg.mozilla.org/releases/mozilla-1.9.2/rev/b438b4ca169c