398946 - Remove JS_STATIC_DLL_CALLBACK and JS_DLL_CALLBACK from the tree

Status: RESOLVED FIXED

(Core :: JavaScript Engine, defect)

Description

[Mats Palmgren (inactive)]

JS_STATIC_DLL_CALLBACK translates to "static" and JS_DLL_CALLBACK to nothing
for all platforms except #ifdef WIN16:
http://bonsai.mozilla.org/cvsblame.cgi?file=/mozilla/js/src/jstypes.h&rev=3.42&root=/cvsroot&mark=86-87,96-97,107-108,116-117,133-134#79
As far as I know, WIN16 is only defined for Windows 3.1 or older - 
which we don't support.

Comment 1

[Arpad Borsos [:Swatinem]]

Attachment: completely remove those macros

The #ifdef WIN16 has been removed for some time.
This patch completely removes those macros replacing them with static or nothing respectively.

Comment 2

[Brendan Eich [:brendan]]

Comment on attachment 333413 [details] [diff] [review]
completely remove those macros

Benjamin, I could use your help here -- I'm deep in other commitments. Thanks,

/be

Comment 3

[Benjamin Smedberg]

Comment on attachment 333413 [details] [diff] [review]
completely remove those macros

I'm fine with this if brendan is!

Comment 4

[Brendan Eich [:brendan]]

Yeah, get rid of unneeded macros.

/be

Comment 5

[Arpad Borsos [:Swatinem]]

Thanks for the review. checkin-needed

Comment 6

[Arpad Borsos [:Swatinem]]

Comment on attachment 333413 [details] [diff] [review]
completely remove those macros

This patch breaks with the new worker threads feature. I will post an updated patch shortly.

Comment 7

[Arpad Borsos [:Swatinem]]

Attachment: updated for worker threads code

Comment 8

[Brendan Eich [:brendan]]

Comment on attachment 334267 [details] [diff] [review]
updated for worker threads code

Ben should do the r+ then.

/be

Comment 9

[Brendan Eich [:brendan]]

An interdiff between two diff-able patches would be great.

/be

Comment 10

[Arpad Borsos [:Swatinem]]

Attachment: interdiff

Comment 11

[Ben Turner (not reading bugmail, use the needinfo flag!)]

Comment on attachment 334267 [details] [diff] [review]
updated for worker threads code

>-  static JSBool JS_DLL_CALLBACK AddEventListenerHelper(JSContext *cx,
>+  static JSBool AddEventListenerHelper(JSContext *cx,
>                                                        JSObject *obj,
>                                                        uintN argc, jsval *argv,
>                                                        jsval *rval);

> typedef JSBool
>-(* JS_DLL_CALLBACK JSDHashInitEntry)(JSDHashTable *table,
>+(* JSDHashInitEntry)(JSDHashTable *table,
>                                      JSDHashEntryHdr *entry,
>                                      const void *key);

Things like this make the code really ugly... If you're going to change the indentation of the first line then please rewrap the next ones.

Comment 12

[Arpad Borsos [:Swatinem]]

Attachment: indentation fixed

Comment 13

[Arpad Borsos [:Swatinem]]

Attachment: fixed a typo [Checkin: Comment 15]

I found a typo which stopped the patch from compiling, sorry.

Comment 14

[Ben Turner (not reading bugmail, use the needinfo flag!)]

Comment on attachment 334449 [details] [diff] [review]
fixed a typo
[Checkin: Comment 15]

Thanks! Assuming this compiles and passes unit tests I think this looks fine.

Comment 15

[Serge Gautherie (:sgautherie)]

Comment on attachment 334449 [details] [diff] [review]
fixed a typo
[Checkin: Comment 15]

Fixed 1 "rej" from
[
patching file dom/src/base/nsJSEnvironment.cpp
Hunk #4 succeeded at 871 with fuzz 1 (offset 12 lines).
patching file js/src/jsapi.cpp
Hunk #1 FAILED at 4335
1 out of 2 hunks FAILED -- saving rejects to file js/src/jsapi.cpp.rej
patching file js/src/jscntxt.cpp
Hunk #1 succeeded at 84 with fuzz 2 (offset 4 lines).
patching file js/src/jscntxt.h
Hunk #1 succeeded at 195 with fuzz 2 (offset 62 lines).
patching file js/src/jsxml.cpp
Hunk #1 succeeded at 6038 with fuzz 2 (offset -146 lines).
patching file js/src/jsxml.h
Hunk #1 succeeded at 56 with fuzz 1 (offset -54 lines).
patching file js/src/liveconnect/jsj_JavaClass.c
Hunk #1 succeeded at 60 with fuzz 2 (offset -1 lines).
patching file js/src/prmjtime.cpp
Hunk #1 succeeded at 561 with fuzz 2 (offset 0 lines).
patching file js/src/xpconnect/src/xpcconvert.cpp
Hunk #1 succeeded at 167 with fuzz 2 (offset -45 lines).
]

http://hg.mozilla.org/mozilla-central/rev/e71240d4b28c

Comment 16

[Serge Gautherie (:sgautherie)]

Attachment: (Bv1) "dom_quickstubs.cpp" bustage fix [Checkin: Comment 16]

[
dom_quickstubs.cpp:117: error: ‘JS_DLL_CALLBACK’ does not name a type
...
dom_quickstubs.cpp:12207: error: invalid use of non-lvalue array
]

Update new <qsgen.py> too.
http://hg.mozilla.org/mozilla-central/rev/b4ccb313bbb7