310539 - Checkin for Bug 280769 broke AIX tinderbox

Status: VERIFIED FIXED

(Core :: JavaScript Engine, defect)

Description

[Philip K. Warren]

Here is the error from the tinderbox build:

"/home/tbox/sb/tinderbox/AIX_5.1_Clobber/mozilla/js/src/jsregexp.c", line 206.9:
1506-213 (S) Macro name ARG_MAX cannot be redefined.
gmake[4]: *** [jsregexp.o] Error 1

Comment 1

[Philip K. Warren]

The conflict appears to be in /usr/include/limits.h (linked to
/usr/include/sys/limits.h):

./sys/limits.h:#define  ARG_MAX         24576
./limits.h:#define      ARG_MAX         24576

I believe a simple:

#ifdef ARG_MAX
#undef ARG_MAX
#endif

in jsregexp.c will fix this issue.

Comment 2

[Philip K. Warren]

Attachment: Patch v1

This fixes the issue.

Comment 3

[Blake Kaplan (:mrbkap) (inactive)]

Comment on attachment 197965 [details] [diff] [review]
Patch v1

It's too bad we need this :-/. r=mrbkap

Comment 4

[Blake Kaplan (:mrbkap) (inactive)]

You're going to want to check this in on the branch as well.

Comment 5

[Blake Kaplan (:mrbkap) (inactive)]

Philip, only one review is needed in js/src (and brendan tends to rubber-stamp
these sorts of fixes anyway), so I think you can go ahead and check this in.

Comment 6

[Igor Bukanov]

Attachment: No need for ARG_MAX

ARG_MAX was used only to define OFFSET_MAX so the patch simply use in
OFFSET_OFF the definition ARG_MAX removing the latter.

Comment 7

[Blake Kaplan (:mrbkap) (inactive)]

Comment on attachment 198154 [details] [diff] [review]
No need for ARG_MAX

Yeah, I like this one better.

Comment 8

[Brendan Eich [:brendan]]

Comment on attachment 198154 [details] [diff] [review]
No need for ARG_MAX

jsregexp.c should really use standard bytecode macros anyway.  Some other time.
 This should be checked into trunk and branch, it's a good porting fix.

/be

Comment 9

[Blake Kaplan (:mrbkap) (inactive)]

Fix checked in on MOZILLA_1_8_BRANCH and trunk.

Comment 10

[Daniel Veditz [:dveditz]]

Nominating, needed if bug 280769 is taken

Comment 11

[Daniel Veditz [:dveditz]]

Fix incorporated into the backported patch for bug 280769