Closed Bug 484010 Opened 15 years ago Closed 15 years ago

jslock.h conflicts with AIX system header priv.h

Categories

(Core :: JavaScript Engine, defect)

PowerPC
Other
defect
Not set
normal

Tracking

()

RESOLVED FIXED

People

(Reporter: andrew, Assigned: andrew)

Details

(Whiteboard: fixed-in-tracemonkey)

Attachments

(1 file)

User-Agent:       Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.0.7) Gecko/2009021910 Firefox/3.0.7
Build Identifier: mozilla-central

"/usr/include/sys/priv.h", line 69.9: 1540-0848 (S) The macro name "SET_OBJ_INFO" is already defined with a different definition.
"jslock.h", line 296.9: 1540-0425 (I) "SET_OBJ_INFO" is defined on line 296 of "jslock.h".

Please make #defines in jslock.h more unique by prefixing with JS_ or something similar to avoid conflict with AIX system headers.

Reproducible: Always
Attachment #368033 - Flags: review?(mrbkap)
Attachment #368033 - Flags: review?(mrbkap) → review+
Either request SR if necessary or set checkin-needed keyword.
Status: UNCONFIRMED → NEW
Ever confirmed: true
Assignee: general → andrew
Keywords: checkin-needed
Comment on attachment 368033 [details] [diff] [review]
add JS_ prefix to #defines

>diff -r 6d71ec255150 js/src/jslock.h
>--- a/js/src/jslock.h    Wed Mar 18 15:59:57 2009 +0100
>+++ b/js/src/jslock.h    Wed Mar 18 12:19:04 2009 -0400
>@@ -136,10 +136,10 @@
> 
> #ifdef JS_DEBUG_TITLE_LOCKS
> 
>-#define SET_OBJ_INFO(obj_, file_, line_)                                       \
>-    SET_SCOPE_INFO(OBJ_SCOPE(obj_), file_, line_)
>+#define JS_SET_OBJ_INFO(obj_, file_, line_)                                       \
>+    JS_SET_SCOPE_INFO(OBJ_SCOPE(obj_), file_, line_)
> 
>-#define SET_SCOPE_INFO(scope_, file_, line_)                                   \
>+#define JS_SET_SCOPE_INFO(scope_, file_, line_)                                   \

The backslashes should remain in column 79.

/be
http://hg.mozilla.org/mozilla-central/rev/3ec5c672f872
Status: NEW → RESOLVED
Closed: 15 years ago
Keywords: checkin-needed
Resolution: --- → FIXED
Flags: in-testsuite-
You need to log in before you can comment on or make changes to this bug.

Attachment

General

Created:
Updated:
Size: