60 lines
1.8 KiB
C++
60 lines
1.8 KiB
C++
$NetBSD: patch-mozilla_dom_system_OSFileConstants.cpp,v 1.2 2015/07/09 15:17:34 ryoon Exp $
|
|
|
|
--- mozilla/dom/system/OSFileConstants.cpp.orig 2015-06-08 17:49:30.000000000 +0000
|
|
+++ mozilla/dom/system/OSFileConstants.cpp
|
|
@@ -9,6 +9,10 @@
|
|
|
|
#include "prsystem.h"
|
|
|
|
+#if defined(__NetBSD__)
|
|
+#include <sys/param.h>
|
|
+#endif
|
|
+
|
|
#if defined(XP_UNIX)
|
|
#include "unistd.h"
|
|
#include "dirent.h"
|
|
@@ -18,7 +22,9 @@
|
|
#define statvfs statfs
|
|
#else
|
|
#include "sys/statvfs.h"
|
|
+#if !(defined(__NetBSD__) && (__NetBSD_Version__ < 600000000))
|
|
#include <spawn.h>
|
|
+#endif // !NetBSD 5.*
|
|
#endif // defined(ANDROID)
|
|
#endif // defined(XP_UNIX)
|
|
|
|
@@ -26,9 +32,9 @@
|
|
#include <linux/fadvise.h>
|
|
#endif // defined(XP_LINUX)
|
|
|
|
-#if defined(XP_MACOSX)
|
|
+#if defined(XP_DARWIN)
|
|
#include "copyfile.h"
|
|
-#endif // defined(XP_MACOSX)
|
|
+#endif // defined(XP_DARWIN)
|
|
|
|
#if defined(XP_WIN)
|
|
#include <windows.h>
|
|
@@ -588,10 +594,10 @@ static const dom::ConstantSpec gLibcProp
|
|
// The size of |fsblkcnt_t|.
|
|
{ "OSFILE_SIZEOF_FSBLKCNT_T", INT_TO_JSVAL(sizeof (fsblkcnt_t)) },
|
|
|
|
-#if !defined(ANDROID)
|
|
+#if !defined(ANDROID) && !(defined(__NetBSD__) && (__NetBSD_Version__ < 600000000))
|
|
// The size of |posix_spawn_file_actions_t|.
|
|
{ "OSFILE_SIZEOF_POSIX_SPAWN_FILE_ACTIONS_T", INT_TO_JSVAL(sizeof (posix_spawn_file_actions_t)) },
|
|
-#endif // !defined(ANDROID)
|
|
+#endif // !defined(ANDROID) && NetBSD 5.*
|
|
|
|
// Defining |dirent|.
|
|
// Size
|
|
@@ -660,7 +666,7 @@ static const dom::ConstantSpec gLibcProp
|
|
|
|
{ "OSFILE_SIZEOF_STATVFS", INT_TO_JSVAL(sizeof (struct statvfs)) },
|
|
|
|
- { "OSFILE_OFFSETOF_STATVFS_F_BSIZE", INT_TO_JSVAL(offsetof (struct statvfs, f_bsize)) },
|
|
+ { "OSFILE_OFFSETOF_STATVFS_F_FRSIZE", INT_TO_JSVAL(offsetof (struct statvfs, f_frsize)) },
|
|
{ "OSFILE_OFFSETOF_STATVFS_F_BAVAIL", INT_TO_JSVAL(offsetof (struct statvfs, f_bavail)) },
|
|
|
|
#endif // defined(XP_UNIX)
|