You've already forked linux-packaging-mono
Imported Upstream version 4.8.0.309
Former-commit-id: 5f9c6ae75f295e057a7d2971f3a6df4656fa8850
This commit is contained in:
parent
ee1447783b
commit
94b2861243
@@ -241,6 +241,8 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
ACLOCAL = @ACLOCAL@
|
||||
AMTAR = @AMTAR@
|
||||
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
||||
AOT_BUILD_FLAGS = @AOT_BUILD_FLAGS@
|
||||
AOT_RUN_FLAGS = @AOT_RUN_FLAGS@
|
||||
API_VER = @API_VER@
|
||||
AR = @AR@
|
||||
AS = @AS@
|
||||
@@ -249,6 +251,11 @@ AUTOHEADER = @AUTOHEADER@
|
||||
AUTOMAKE = @AUTOMAKE@
|
||||
AWK = @AWK@
|
||||
BOEHM_DEFINES = @BOEHM_DEFINES@
|
||||
BTLS_ARCH = @BTLS_ARCH@
|
||||
BTLS_CFLAGS = @BTLS_CFLAGS@
|
||||
BTLS_CMAKE_ARGS = @BTLS_CMAKE_ARGS@
|
||||
BTLS_PLATFORM = @BTLS_PLATFORM@
|
||||
BTLS_ROOT = @BTLS_ROOT@
|
||||
BUILD_EXEEXT = @BUILD_EXEEXT@
|
||||
CC = @CC@
|
||||
CCAS = @CCAS@
|
||||
@@ -258,6 +265,7 @@ CCDEPMODE = @CCDEPMODE@
|
||||
CC_FOR_BUILD = @CC_FOR_BUILD@
|
||||
CFLAGS = @CFLAGS@
|
||||
CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
|
||||
CMAKE = @CMAKE@
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CXX = @CXX@
|
||||
@@ -278,7 +286,6 @@ ECHO_C = @ECHO_C@
|
||||
ECHO_N = @ECHO_N@
|
||||
ECHO_T = @ECHO_T@
|
||||
EGREP = @EGREP@
|
||||
ENABLE_PERF_EVENTS = @ENABLE_PERF_EVENTS@
|
||||
EXEEXT = @EXEEXT@
|
||||
FGREP = @FGREP@
|
||||
GDKX11 = @GDKX11@
|
||||
@@ -293,10 +300,12 @@ HAVE_MSGFMT = @HAVE_MSGFMT@
|
||||
HOST_CC = @HOST_CC@
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_MOBILE_STATIC = @INSTALL_MOBILE_STATIC@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
||||
INTL = @INTL@
|
||||
INVARIANT_AOT_OPTIONS = @INVARIANT_AOT_OPTIONS@
|
||||
LD = @LD@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
LIBC = @LIBC@
|
||||
@@ -343,6 +352,7 @@ PACKAGE_URL = @PACKAGE_URL@
|
||||
PACKAGE_VERSION = @PACKAGE_VERSION@
|
||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
|
||||
RANLIB = @RANLIB@
|
||||
SED = @SED@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
@@ -352,6 +362,7 @@ SHELL = @SHELL@
|
||||
SQLITE = @SQLITE@
|
||||
SQLITE3 = @SQLITE3@
|
||||
STRIP = @STRIP@
|
||||
TEST_PROFILE = @TEST_PROFILE@
|
||||
USE_NLS = @USE_NLS@
|
||||
VERSION = @VERSION@
|
||||
VTUNE_CFLAGS = @VTUNE_CFLAGS@
|
||||
|
||||
@@ -1 +1 @@
|
||||
136f2b71878105b87fdcb5ccb5faa0f1cc943646
|
||||
92fca755371d09ab6336dd25c5c131d014c47d7d
|
||||
@@ -22,6 +22,11 @@
|
||||
#define __BSD_VISIBLE 1
|
||||
#endif
|
||||
|
||||
#ifdef __NetBSD__
|
||||
/* For mincore () */
|
||||
#define _NETBSD_SOURCE
|
||||
#endif
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/mman.h>
|
||||
#include <errno.h>
|
||||
@@ -109,8 +114,15 @@ Mono_Posix_Syscall_mremap (void *old_address, mph_size_t old_size,
|
||||
if (Mono_Posix_FromMremapFlags (flags, &_flags) == -1)
|
||||
return MAP_FAILED;
|
||||
|
||||
#if defined(linux)
|
||||
return mremap (old_address, (size_t) old_size, (size_t) new_size,
|
||||
(unsigned long) _flags);
|
||||
#elif defined(__NetBSD__)
|
||||
return mremap (old_address, (size_t) old_size, old_address,
|
||||
(size_t) new_size, (unsigned long) _flags);
|
||||
#else
|
||||
#error Port me
|
||||
#endif
|
||||
}
|
||||
#endif /* def HAVE_MREMAP */
|
||||
|
||||
|
||||
@@ -194,21 +194,22 @@ ReadZStream (ZStream *stream, guchar *buffer, gint length)
|
||||
while (zs->avail_out > 0) {
|
||||
if (zs->avail_in == 0) {
|
||||
n = stream->func (stream->buffer, BUFFER_SIZE, stream->gchandle);
|
||||
n = n < 0 ? 0 : n;
|
||||
stream->total_in += n;
|
||||
if (n <= 0) {
|
||||
stream->eof = TRUE;
|
||||
}
|
||||
zs->next_in = stream->buffer;
|
||||
zs->avail_in = n < 0 ? 0 : n;
|
||||
zs->avail_in = n;
|
||||
}
|
||||
|
||||
if (zs->avail_in == 0 && (zs->total_in == 0 || stream->total_in == zs->total_in))
|
||||
return Z_STREAM_END;
|
||||
if (zs->avail_in == 0 && zs->total_in == 0)
|
||||
return 0;
|
||||
|
||||
status = inflate (stream->stream, Z_SYNC_FLUSH);
|
||||
if (status == Z_STREAM_END) {
|
||||
stream->eof = TRUE;
|
||||
break;
|
||||
} else if (status == Z_BUF_ERROR && stream->total_in == zs->total_in) {
|
||||
stream->eof = TRUE;
|
||||
break;
|
||||
} else if (status != Z_OK) {
|
||||
return status;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user