1106551 - Fix build on OpenBSD after bug 918140

Status: RESOLVED FIXED

(Core Graveyard :: File Handling, defect)

Description

[Landry Breuil (:gaston)]

Attachment: fix-918140-regression

Since bug 918140 landed in https://hg.mozilla.org/mozilla-central/rev/4d55c412cacd build fails on OpenBSD:

 1:34.00 In file included from /home/othersrc/mozilla-central/xpcom/io/nsLocalFileUnix.cpp:14:
 1:34.00 In file included from ../../dist/system_wrappers/sys/mount.h:3:
 1:34.00 In file included from /usr/include/sys/mount.h:40:
 1:34.00 /usr/include/sys/ucred.h:53:18: error: use of undeclared identifier 'NGROUPS'
 1:34.06         gid_t   cr_groups[NGROUPS];     /* groups */
 1:34.06                           ^
 1:34.06 /usr/include/sys/ucred.h:65:18: error: use of undeclared identifier 'NGROUPS'
 1:34.06         gid_t   cr_groups[NGROUPS];     /* groups */

This is because sys/mount.h is included to get the BLOCK_SIZE #define, and on OpenBSD you cant include sys/mount.h without including sys/param.h before to get the definition for NGROUPS.

Since BLOCK_SIZE seem to be specific to linux quotas (as USE_LINUX_QUOTACTL is set only if sys/quota.h *and* linux/quota.h are found), i'd suggest moving sys/mount.h inclusion within the same ifdef.

Comment 1

[Landry Breuil (:gaston)]

Benjamin, straighforward review ping ? :)

Comment 2

[Landry Breuil (:gaston)]

Comment on attachment 8530858 [details] [diff] [review]
fix-918140-regression

whoever reviews it first gets a cookie :)

Comment 3

[Nathan Froyd [:froydnj]]

Comment on attachment 8530858 [details] [diff] [review]
fix-918140-regression

Review of attachment 8530858 [details] [diff] [review]:
-----------------------------------------------------------------

Cookies are a tasty treat.

Comment 4

[Landry Breuil (:gaston)]

https://hg.mozilla.org/integration/mozilla-inbound/rev/751970b5e4da

here you are ! http://189degrees.files.wordpress.com/2011/03/chocolate_chip_cookie.jpg

Comment 5

[Landry Breuil (:gaston)]

Comment on attachment 8530858 [details] [diff] [review]
fix-918140-regression

Approval Request Comment
[Feature/regressing bug #]:918140 
[User impact if declined]: FTBFS on OpenBSD
[Describe test coverage new/current, TBPL]: Fixes build on OpenBSD, NPOTB other wise (codepath affects only linux and the change doesnt modify it)

Comment 6

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/751970b5e4da

Comment 7

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/releases/mozilla-aurora/rev/e153c2778a8b