Merge branch 'upstream'
Former-commit-id: 41a04ea17bc412e430b2ea44e271e26e5e9e65bd
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
commit
69daef3e2a
@ -1 +1 @@
|
||||
0b2a1214a98cbefd7d58e14ca2efbefbaa3f0057
|
||||
ab06dc009f387763965cd03d86acb5f1d549d1a9
|
||||
@ -1 +1 @@
|
||||
20cc6e3b8c7d65106b21cd262be62a6eac1e70cc
|
||||
ccb1e8a538dfd6e97ee03e96a16fa6def0f82433
|
||||
@ -41,7 +41,7 @@ static partial class Consts
|
||||
// Use these assembly version constants to make code more maintainable.
|
||||
//
|
||||
|
||||
public const string MonoVersion = "6.4.0.179";
|
||||
public const string MonoVersion = "6.4.0.181";
|
||||
public const string MonoCompany = "Mono development team";
|
||||
public const string MonoProduct = "Mono Common Language Infrastructure";
|
||||
public const string MonoCopyright = "(c) Various Mono authors";
|
||||
|
||||
@ -1 +1 @@
|
||||
627ab97bbabd65bbae7748d8d28e9e54bf56ff7c
|
||||
dfaa710d8cffa989eb11658766d4744ea5a6e602
|
||||
@ -1 +1 @@
|
||||
c2a9d813ccf421033d738b3f530b2de85c33dc47
|
||||
01f8f6c6468af20d8c19ddeb64956ab06e7807fc
|
||||
@ -1 +1 @@
|
||||
3fe2ead56ae8646f2cb9b038dbb1d52d3fd0b0af
|
||||
edfdea03528d626dc090d70ac981441a1854222d
|
||||
@ -1 +1 @@
|
||||
1a2c5420edf047287db4445353c603b5c5317ecf
|
||||
ca40e636a03390d303343a07feb3e07739b0482d
|
||||
@ -1 +1 @@
|
||||
c2d93d57bf128fe40c27d2ed7ae42161f355f882
|
||||
f8133a815d0ff5cc0c72c10e5ba6d97278601794
|
||||
@ -1 +1 @@
|
||||
c6fe85b54fa2b70584615a17de90e3dbdf215ccb
|
||||
a60638f0af8bb80d1c7ce9b4c5941fe038ec9e50
|
||||
@ -1 +1 @@
|
||||
4ab2f35229d314adf15f540839024dd8bbcdf76d
|
||||
08b8eee766db7b49dcefb7d9d1662649d31654f4
|
||||
@ -1 +1 @@
|
||||
627ab97bbabd65bbae7748d8d28e9e54bf56ff7c
|
||||
dfaa710d8cffa989eb11658766d4744ea5a6e602
|
||||
@ -1 +1 @@
|
||||
c2a9d813ccf421033d738b3f530b2de85c33dc47
|
||||
01f8f6c6468af20d8c19ddeb64956ab06e7807fc
|
||||
@ -1 +1 @@
|
||||
3fe2ead56ae8646f2cb9b038dbb1d52d3fd0b0af
|
||||
edfdea03528d626dc090d70ac981441a1854222d
|
||||
@ -1 +1 @@
|
||||
1a2c5420edf047287db4445353c603b5c5317ecf
|
||||
ca40e636a03390d303343a07feb3e07739b0482d
|
||||
@ -1 +1 @@
|
||||
c2d93d57bf128fe40c27d2ed7ae42161f355f882
|
||||
f8133a815d0ff5cc0c72c10e5ba6d97278601794
|
||||
@ -1 +1 @@
|
||||
c6fe85b54fa2b70584615a17de90e3dbdf215ccb
|
||||
a60638f0af8bb80d1c7ce9b4c5941fe038ec9e50
|
||||
@ -1 +1 @@
|
||||
25716aa06322368425562ef1bc5fb580d9cbb691
|
||||
70454f8b5a181f77a55c7e8be735ed2b06d930f2
|
||||
@ -1 +1 @@
|
||||
4ab2f35229d314adf15f540839024dd8bbcdf76d
|
||||
08b8eee766db7b49dcefb7d9d1662649d31654f4
|
||||
@ -1 +1 @@
|
||||
627ab97bbabd65bbae7748d8d28e9e54bf56ff7c
|
||||
dfaa710d8cffa989eb11658766d4744ea5a6e602
|
||||
@ -1 +1 @@
|
||||
c2a9d813ccf421033d738b3f530b2de85c33dc47
|
||||
01f8f6c6468af20d8c19ddeb64956ab06e7807fc
|
||||
@ -1 +1 @@
|
||||
3fe2ead56ae8646f2cb9b038dbb1d52d3fd0b0af
|
||||
edfdea03528d626dc090d70ac981441a1854222d
|
||||
@ -1 +1 @@
|
||||
1a2c5420edf047287db4445353c603b5c5317ecf
|
||||
ca40e636a03390d303343a07feb3e07739b0482d
|
||||
@ -1 +1 @@
|
||||
c2d93d57bf128fe40c27d2ed7ae42161f355f882
|
||||
f8133a815d0ff5cc0c72c10e5ba6d97278601794
|
||||
@ -1 +1 @@
|
||||
c6fe85b54fa2b70584615a17de90e3dbdf215ccb
|
||||
a60638f0af8bb80d1c7ce9b4c5941fe038ec9e50
|
||||
@ -1 +1 @@
|
||||
25716aa06322368425562ef1bc5fb580d9cbb691
|
||||
70454f8b5a181f77a55c7e8be735ed2b06d930f2
|
||||
@ -1 +1 @@
|
||||
4ab2f35229d314adf15f540839024dd8bbcdf76d
|
||||
08b8eee766db7b49dcefb7d9d1662649d31654f4
|
||||
@ -1 +1 @@
|
||||
627ab97bbabd65bbae7748d8d28e9e54bf56ff7c
|
||||
dfaa710d8cffa989eb11658766d4744ea5a6e602
|
||||
@ -1 +1 @@
|
||||
c2a9d813ccf421033d738b3f530b2de85c33dc47
|
||||
01f8f6c6468af20d8c19ddeb64956ab06e7807fc
|
||||
@ -1 +1 @@
|
||||
d78044dc72ca5ff1d78f02c10c8522e43c78626f
|
||||
0fbe23ab4e57bf05537345c1627fecb4583bebaa
|
||||
@ -1 +1 @@
|
||||
1a2c5420edf047287db4445353c603b5c5317ecf
|
||||
ca40e636a03390d303343a07feb3e07739b0482d
|
||||
@ -1 +1 @@
|
||||
c2d93d57bf128fe40c27d2ed7ae42161f355f882
|
||||
f8133a815d0ff5cc0c72c10e5ba6d97278601794
|
||||
@ -1 +1 @@
|
||||
c6fe85b54fa2b70584615a17de90e3dbdf215ccb
|
||||
a60638f0af8bb80d1c7ce9b4c5941fe038ec9e50
|
||||
@ -1 +1 @@
|
||||
25716aa06322368425562ef1bc5fb580d9cbb691
|
||||
70454f8b5a181f77a55c7e8be735ed2b06d930f2
|
||||
@ -1 +1 @@
|
||||
478b6561e172ce539629ccf678381a58edd4e1ed
|
||||
af3f69ba6e43443e118264541f28b41d5e9fd70a
|
||||
@ -45,6 +45,8 @@
|
||||
#define ERROR_IO_PENDING 997
|
||||
#define ERROR_CANT_RESOLVE_FILENAME 1921
|
||||
#define ERROR_ENCRYPTION_FAILED 6000
|
||||
#define WSA_INVALID_PARAMETER ERROR_INVALID_PARAMETER
|
||||
#define WSA_INVALID_HANDLE ERROR_INVALID_HANDLE
|
||||
#define WSAEINTR 10004
|
||||
#define WSAEBADF 10009
|
||||
#define WSAEACCES 10013
|
||||
|
||||
@ -1463,6 +1463,7 @@ mono_w32socket_convert_error (gint error)
|
||||
#ifdef ECONNRESET
|
||||
case ECONNRESET: return WSAECONNRESET;
|
||||
#endif
|
||||
case EDOM: return WSAEINVAL; /* not a precise match, best wecan do. */
|
||||
case EFAULT: return WSAEFAULT;
|
||||
#ifdef EHOSTUNREACH
|
||||
case EHOSTUNREACH: return WSAEHOSTUNREACH;
|
||||
@ -1472,11 +1473,12 @@ mono_w32socket_convert_error (gint error)
|
||||
#endif
|
||||
case EINTR: return WSAEINTR;
|
||||
case EINVAL: return WSAEINVAL;
|
||||
/*FIXME: case EIO: return WSAE????; */
|
||||
case EIO: return WSA_INVALID_HANDLE; /* not a precise match, best we can do. */
|
||||
#ifdef EISCONN
|
||||
case EISCONN: return WSAEISCONN;
|
||||
#endif
|
||||
case ELOOP: return WSAELOOP;
|
||||
case ENFILE: return WSAEMFILE; /* not a precise match, best we can do. */
|
||||
case EMFILE: return WSAEMFILE;
|
||||
#ifdef EMSGSIZE
|
||||
case EMSGSIZE: return WSAEMSGSIZE;
|
||||
@ -1488,7 +1490,6 @@ mono_w32socket_convert_error (gint error)
|
||||
#ifdef ENOBUFS
|
||||
case ENOBUFS: return WSAENOBUFS; /* not documented */
|
||||
#endif
|
||||
/* case ENOENT: return WSAE????; */
|
||||
case ENOMEM: return WSAENOBUFS;
|
||||
#ifdef ENOPROTOOPT
|
||||
case ENOPROTOOPT: return WSAENOPROTOOPT;
|
||||
@ -1499,7 +1500,7 @@ mono_w32socket_convert_error (gint error)
|
||||
#ifdef ENOTCONN
|
||||
case ENOTCONN: return WSAENOTCONN;
|
||||
#endif
|
||||
/*FIXME: case ENOTDIR: return WSAE????; */
|
||||
case ENOTDIR: return WSA_INVALID_PARAMETER; /* not a precise match, best we can do. */
|
||||
#ifdef ENOTSOCK
|
||||
case ENOTSOCK: return WSAENOTSOCK;
|
||||
#endif
|
||||
|
||||
@ -1 +1 @@
|
||||
#define FULL_VERSION "explicit/3608a49"
|
||||
#define FULL_VERSION "explicit/5ecff82"
|
||||
|
||||
@ -1491,10 +1491,10 @@ distclean-generic:
|
||||
maintainer-clean-generic:
|
||||
@echo "This command is intended for maintainers to use"
|
||||
@echo "it deletes files that may require special tools to rebuild."
|
||||
@CROSS_COMPILE_TRUE@clean-local:
|
||||
@HOST_WIN32_TRUE@clean-local:
|
||||
@CROSS_COMPILE_TRUE@test-local:
|
||||
@HOST_WIN32_TRUE@test-local:
|
||||
@CROSS_COMPILE_TRUE@clean-local:
|
||||
@HOST_WIN32_TRUE@clean-local:
|
||||
clean: clean-am
|
||||
|
||||
clean-am: clean-checkPROGRAMS clean-generic clean-libtool clean-local \
|
||||
|
||||
@ -51,9 +51,11 @@
|
||||
#define MAP_ANONYMOUS MAP_ANON
|
||||
#endif
|
||||
|
||||
#if !defined(__APPLE__) // returning virtual addresses <4G requires entitlement on Apple platforms, do not use it
|
||||
#ifndef MAP_32BIT
|
||||
#define MAP_32BIT 0
|
||||
#endif
|
||||
#endif
|
||||
|
||||
typedef struct {
|
||||
int size;
|
||||
@ -277,8 +279,10 @@ mono_valloc (void *addr, size_t length, int flags, MonoMemAccountType type)
|
||||
/* translate the flags */
|
||||
if (flags & MONO_MMAP_FIXED)
|
||||
mflags |= MAP_FIXED;
|
||||
#if !defined(__APPLE__) // returning virtual addresses <4G requires entitlement on Apple platforms, do not use it
|
||||
if (flags & MONO_MMAP_32BIT)
|
||||
mflags |= MAP_32BIT;
|
||||
#endif
|
||||
|
||||
#ifdef HOST_WASM
|
||||
if (length == 0)
|
||||
@ -374,8 +378,10 @@ mono_file_map (size_t length, int flags, int fd, guint64 offset, void **ret_hand
|
||||
mflags |= MAP_SHARED;
|
||||
if (flags & MONO_MMAP_FIXED)
|
||||
mflags |= MAP_FIXED;
|
||||
#if !defined(__APPLE__) // returning virtual addresses <4G requires entitlement on Apple platforms, do not use it
|
||||
if (flags & MONO_MMAP_32BIT)
|
||||
mflags |= MAP_32BIT;
|
||||
#endif
|
||||
|
||||
#ifdef HOST_WASM
|
||||
if (length == 0)
|
||||
|
||||
@ -520,8 +520,8 @@ distclean-generic:
|
||||
maintainer-clean-generic:
|
||||
@echo "This command is intended for maintainers to use"
|
||||
@echo "it deletes files that may require special tools to rebuild."
|
||||
@ENABLE_MSVC_FALSE@clean-local:
|
||||
@ENABLE_MSVC_FALSE@install-exec-local:
|
||||
@ENABLE_MSVC_FALSE@clean-local:
|
||||
clean: clean-am
|
||||
|
||||
clean-am: clean-generic clean-libtool clean-local mostlyclean-am
|
||||
|
||||
BIN
po/mcs/de.gmo
BIN
po/mcs/de.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
73f9b65a9ba79c531281048015310cf7db5d7c3b
|
||||
88f0e769332f884a52c56b22626f4d632a0c5eb0
|
||||
BIN
po/mcs/es.gmo
BIN
po/mcs/es.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
21bb69978a1d9e2c2f5a54bf5686df1173065ee5
|
||||
269c3fe708b9608aa227e9718e5b64f2aca6b50c
|
||||
BIN
po/mcs/ja.gmo
BIN
po/mcs/ja.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
8209af39a9c482acc2479d3a933f1c6b52d3aa83
|
||||
a893f94307c5e44b9455ea19a348b82b97606ea2
|
||||
@ -6,9 +6,9 @@
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: mono 6.4.0.179\n"
|
||||
"Project-Id-Version: mono 6.4.0.181\n"
|
||||
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
|
||||
"POT-Creation-Date: 2019-08-25 08:04+0000\n"
|
||||
"POT-Creation-Date: 2019-08-27 08:05+0000\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
|
||||
BIN
po/mcs/pt_BR.gmo
BIN
po/mcs/pt_BR.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
0f7e4f71dc1a88fadc4e1d35fb19cd9b76bfec66
|
||||
f4ccdfbaae15c5a0d969d63b009f851927437f24
|
||||
Loading…
x
Reference in New Issue
Block a user