Bug 1106551 - Include sys/mount.h only in the linux quota case. r=froydnj, a=sledru
authorLandry Breuil <landry@openbsd.org>
Fri, 05 Dec 2014 15:46:53 +0100
changeset 242345 e153c2778a8b9a506f007b40657e26a50600ceb5
parent 242344 b716e52f2027970a283b1c648d7674ef7aa455f5
child 242346 94d7d4fe5f338824eda03ff85e51be3ff3fa2c72
push id4311
push userraliiev@mozilla.com
push dateMon, 12 Jan 2015 19:37:41 +0000
treeherdermozilla-beta@150c9fed433b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj, sledru
bugs1106551
milestone36.0a2
Bug 1106551 - Include sys/mount.h only in the linux quota case. r=froydnj, a=sledru Fixes build on OpenBSD where you cant include sys/mount.h alone, you also need sys/param.h
xpcom/io/nsLocalFileUnix.cpp
--- a/xpcom/io/nsLocalFileUnix.cpp
+++ b/xpcom/io/nsLocalFileUnix.cpp
@@ -6,32 +6,32 @@
 
 /**
  * Implementation of nsIFile for "unixy" systems.
  */
 
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/Attributes.h"
 
-#include <sys/mount.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <utime.h>
 #include <dirent.h>
 #include <ctype.h>
 #include <locale.h>
 #if defined(VMS)
 #include <fabdef.h>
 #endif
 
 #if defined(HAVE_SYS_QUOTA_H) && defined(HAVE_LINUX_QUOTA_H)
 #define USE_LINUX_QUOTACTL
+#include <sys/mount.h>
 #include <sys/quota.h>
 #endif
 
 #include "xpcom-private.h"
 #include "nsDirectoryServiceDefs.h"
 #include "nsCRT.h"
 #include "nsCOMPtr.h"
 #include "nsMemory.h"