Import of pkgsrc-2015Q3
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
$NetBSD: patch-mozilla_dom_system_OSFileConstants.cpp,v 1.1 2014/07/27 20:04:59 ryoon Exp $
|
||||
$NetBSD: patch-mozilla_dom_system_OSFileConstants.cpp,v 1.2 2015/07/09 15:17:34 ryoon Exp $
|
||||
|
||||
--- mozilla/dom/system/OSFileConstants.cpp.orig 2014-07-18 00:05:16.000000000 +0000
|
||||
--- mozilla/dom/system/OSFileConstants.cpp.orig 2015-06-08 17:49:30.000000000 +0000
|
||||
+++ mozilla/dom/system/OSFileConstants.cpp
|
||||
@@ -9,6 +9,10 @@
|
||||
|
||||
@@ -13,7 +13,17 @@ $NetBSD: patch-mozilla_dom_system_OSFileConstants.cpp,v 1.1 2014/07/27 20:04:59
|
||||
#if defined(XP_UNIX)
|
||||
#include "unistd.h"
|
||||
#include "dirent.h"
|
||||
@@ -26,9 +30,9 @@
|
||||
@@ -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)
|
||||
|
||||
@@ -25,12 +35,12 @@ $NetBSD: patch-mozilla_dom_system_OSFileConstants.cpp,v 1.1 2014/07/27 20:04:59
|
||||
|
||||
#if defined(XP_WIN)
|
||||
#include <windows.h>
|
||||
@@ -564,10 +568,10 @@ static const dom::ConstantSpec gLibcProp
|
||||
@@ -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))
|
||||
+#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)
|
||||
@@ -38,7 +48,7 @@ $NetBSD: patch-mozilla_dom_system_OSFileConstants.cpp,v 1.1 2014/07/27 20:04:59
|
||||
|
||||
// Defining |dirent|.
|
||||
// Size
|
||||
@@ -627,7 +631,7 @@ static const dom::ConstantSpec gLibcProp
|
||||
@@ -660,7 +666,7 @@ static const dom::ConstantSpec gLibcProp
|
||||
|
||||
{ "OSFILE_SIZEOF_STATVFS", INT_TO_JSVAL(sizeof (struct statvfs)) },
|
||||
|
||||
|
||||
Reference in New Issue
Block a user