606834 - [OS/2] follow-up Make int32* and int32_t* inter-convertible

Status: RESOLVED FIXED

(Core :: JavaScript Engine, defect)

Description

[Walter Meinl]

User-Agent:       Mozilla/5.0 (OS/2; Warp 4.5; rv:2.0b8pre) Gecko/20101023 Firefox/4.0b8pre
Build Identifier: 

mozilla/js/src/jsarray.cpp: In function 'jsuint ValueIsLength(JSContext*, js::Value*)':
mozilla/js/src/jsarray.cpp:219: error: call of overloaded 'setNumber(jsuint&)' is ambiguous
mozilla/js/src/jsarray.cpp: In function 'bool IsDenseArrayId(JSContext*, JSObject*, jsid)':
mozilla/js/src/jsarray.cpp:647: error: invalid conversion from 'uint32*' to 'jsuint*'
and so on...

in bug603471 int32* and int32_t* were made inter-convertible on windows. We had the same typedefs as windows and they remained the old-ones. Removing in jsotypes.h the old typedefs in ifdef XP_OS2 parts lets the build succeed again on OS/2.

Reproducible: Always

Comment 1

[Walter Meinl]

Attachment: build fix

we used the windows typedefs since beginning of time, probably the if !defined(XP_OS2) parts could have gone away since the switch to gcc. Another note, first I added XP_OS2 to ifdef XP_UNIX to include <sys/types.h> which worked as well. I could add it back, if you think its better, but it build like this also.

Comment 2

[Rich Walsh]

(In reply to comment #1)
> first I added XP_OS2 to ifdef XP_UNIX to include <sys/types.h> which worked
> as well. I could add it back, if you think its better, but it build like
> this also.

The fewer special cases (i.e. ifdef XP_OS2), the better.

BTW... I checked my log after building with this patch and confirmed it didn't cause any new warnings or the like.

Comment 3

[Dave Yeo]

(In reply to comment #1)
> Created attachment 485621 [details] [diff] [review]
> build fix
> 
> we used the windows typedefs since beginning of time, probably the if
> !defined(XP_OS2) parts could have gone away since the switch to gcc.

I think they would of been needed for the EMX gcc's

> Another
> note, first I added XP_OS2 to ifdef XP_UNIX to include <sys/types.h> which
> worked as well. I could add it back, if you think its better, but it build like
> this also.

Our headers are fairly Posix compliant and we shouldn't ever need to include anything from sys. The exception being that we need sys/time.h for the time struct which is a bug in our headers.

Comment 4

[Walter Meinl]

Comment on attachment 485621 [details] [diff] [review]
build fix

asking a js member for r.

Comment 5

[Bill McCloskey [inactive unless it's an emergency] (:billm)]

http://hg.mozilla.org/tracemonkey/rev/97efcc7226bf

Comment 6

[Chris Leary [:cdleary] (not checking bugmail)]

http://hg.mozilla.org/mozilla-central/rev/97efcc7226bf