Imported Upstream version 5.16.0.100

Former-commit-id: 38faa55fb9669e35e7d8448b15c25dc447f25767
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-08-07 15:19:03 +00:00
parent 0a9828183b
commit 7d7f676260
4419 changed files with 170950 additions and 90273 deletions

View File

@@ -14,6 +14,8 @@ AM_CPPFLAGS = \
$(GLIB_CFLAGS) \
-I$(top_srcdir)
glib_libs = $(top_builddir)/mono/eglib/libeglib.la
# Source code which helps implement the ANSI C standards, and thus *should* be
# portable to any platform having a C compiler.
MPH_C_SOURCE = \
@@ -59,10 +61,10 @@ MPH_UNIX_SOURCE = \
if HOST_WIN32
MPH_SOURCE = $(MPH_C_SOURCE)
MPH_LIBS = $(GLIB_LIBS)
MPH_LIBS = $(glib_libs)
else
MPH_SOURCE = $(MPH_C_SOURCE) $(MPH_UNIX_SOURCE)
MPH_LIBS = $(GLIB_LIBS)
MPH_LIBS = $(glib_libs)
endif
MINIZIP_SOURCE = \
@@ -125,7 +127,7 @@ libMonoSupportW_la_SOURCES = \
supportw.h
libMonoSupportW_la_LIBADD = \
$(GLIB_LIBS)
$(glib_libs)
#
# Use this target to refresh the values in map.[ch]

View File

@@ -125,10 +125,8 @@ am__uninstall_files_from_dir = { \
am__installdirs = "$(DESTDIR)$(libdir)"
LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 =
@HOST_WIN32_FALSE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
@HOST_WIN32_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
libMonoPosixHelper_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
libMonoPosixHelper_la_DEPENDENCIES = $(MPH_LIBS) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am__libMonoPosixHelper_la_SOURCES_DIST = errno.c map.c map.h mph.h \
signal.c stdio.c string.c stdlib.c dirent.c fcntl.c fstab.c \
grp.c macros.c nl.c nl.h old-map.c old-map.h pwd.c serial.c \
@@ -167,7 +165,7 @@ libMonoPosixHelper_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
$(AM_CFLAGS) $(CFLAGS) $(libMonoPosixHelper_la_LDFLAGS) \
$(LDFLAGS) -o $@
@BUILD_SUPPORT_TRUE@am_libMonoPosixHelper_la_rpath = -rpath $(libdir)
libMonoSupportW_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
libMonoSupportW_la_DEPENDENCIES = $(glib_libs)
am_libMonoSupportW_la_OBJECTS = supportw.lo support-heap.lo
libMonoSupportW_la_OBJECTS = $(am_libMonoSupportW_la_OBJECTS)
libMonoSupportW_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
@@ -289,26 +287,17 @@ EXEEXT = @EXEEXT@
FGREP = @FGREP@
GDKX11 = @GDKX11@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
GINT_TO_POINTER = @GINT_TO_POINTER@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GNUC_NORETURN = @GNUC_NORETURN@
GNUC_PRETTY = @GNUC_PRETTY@
GNUC_UNUSED = @GNUC_UNUSED@
GPOINTER_TO_INT = @GPOINTER_TO_INT@
GPOINTER_TO_UINT = @GPOINTER_TO_UINT@
GREP = @GREP@
GSIZE = @GSIZE@
GSIZE_FORMAT = @GSIZE_FORMAT@
GSSIZE = @GSSIZE@
GTKX11 = @GTKX11@
GUINT_TO_POINTER = @GUINT_TO_POINTER@
G_GINT32_FORMAT = @G_GINT32_FORMAT@
G_GINT64_FORMAT = @G_GINT64_FORMAT@
G_GUINT32_FORMAT = @G_GUINT32_FORMAT@
G_GUINT64_FORMAT = @G_GUINT64_FORMAT@
G_HAVE_ISO_VARARGS = @G_HAVE_ISO_VARARGS@
HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_MSGFMT = @HAVE_MSGFMT@
HAVE_NINJA = @HAVE_NINJA@
@@ -485,6 +474,7 @@ AM_CPPFLAGS = \
$(GLIB_CFLAGS) \
-I$(top_srcdir)
glib_libs = $(top_builddir)/mono/eglib/libeglib.la
# Source code which helps implement the ANSI C standards, and thus *should* be
# portable to any platform having a C compiler.
@@ -532,8 +522,8 @@ MPH_UNIX_SOURCE = \
@HOST_WIN32_FALSE@MPH_SOURCE = $(MPH_C_SOURCE) $(MPH_UNIX_SOURCE)
@HOST_WIN32_TRUE@MPH_SOURCE = $(MPH_C_SOURCE)
@HOST_WIN32_FALSE@MPH_LIBS = $(GLIB_LIBS)
@HOST_WIN32_TRUE@MPH_LIBS = $(GLIB_LIBS)
@HOST_WIN32_FALSE@MPH_LIBS = $(glib_libs)
@HOST_WIN32_TRUE@MPH_LIBS = $(glib_libs)
MINIZIP_SOURCE = \
minizip/crypt.h \
minizip/ioapi.c \
@@ -590,7 +580,7 @@ libMonoSupportW_la_SOURCES = \
supportw.h
libMonoSupportW_la_LIBADD = \
$(GLIB_LIBS)
$(glib_libs)
all: all-am

View File

@@ -29,42 +29,49 @@
#define SEEK_SET 0
#endif
static
voidpf ZCALLBACK fopen_file_func OF((
voidpf opaque,
const char* filename,
int mode));
static
uLong ZCALLBACK fread_file_func OF((
voidpf opaque,
voidpf stream,
void* buf,
uLong size));
static
uLong ZCALLBACK fwrite_file_func OF((
voidpf opaque,
voidpf stream,
const void* buf,
uLong size));
static
long ZCALLBACK ftell_file_func OF((
voidpf opaque,
voidpf stream));
static
long ZCALLBACK fseek_file_func OF((
voidpf opaque,
voidpf stream,
uLong offset,
int origin));
static
int ZCALLBACK fclose_file_func OF((
voidpf opaque,
voidpf stream));
static
int ZCALLBACK ferror_file_func OF((
voidpf opaque,
voidpf stream));
static
voidpf ZCALLBACK fopen_file_func (opaque, filename, mode)
voidpf opaque;
const char* filename;
@@ -86,7 +93,7 @@ voidpf ZCALLBACK fopen_file_func (opaque, filename, mode)
return file;
}
static
uLong ZCALLBACK fread_file_func (opaque, stream, buf, size)
voidpf opaque;
voidpf stream;
@@ -98,7 +105,7 @@ uLong ZCALLBACK fread_file_func (opaque, stream, buf, size)
return ret;
}
static
uLong ZCALLBACK fwrite_file_func (opaque, stream, buf, size)
voidpf opaque;
voidpf stream;
@@ -110,6 +117,7 @@ uLong ZCALLBACK fwrite_file_func (opaque, stream, buf, size)
return ret;
}
static
long ZCALLBACK ftell_file_func (opaque, stream)
voidpf opaque;
voidpf stream;
@@ -119,6 +127,7 @@ long ZCALLBACK ftell_file_func (opaque, stream)
return ret;
}
static
long ZCALLBACK fseek_file_func (opaque, stream, offset, origin)
voidpf opaque;
voidpf stream;
@@ -145,6 +154,7 @@ long ZCALLBACK fseek_file_func (opaque, stream, offset, origin)
return ret;
}
static
int ZCALLBACK fclose_file_func (opaque, stream)
voidpf opaque;
voidpf stream;
@@ -154,6 +164,7 @@ int ZCALLBACK fclose_file_func (opaque, stream)
return ret;
}
static
int ZCALLBACK ferror_file_func (opaque, stream)
voidpf opaque;
voidpf stream;

View File

@@ -300,7 +300,7 @@ local int strcmpcasenosensitive_internal (const char *fileName1, const char *fil
(like 1 on Unix, 2 on Windows)
*/
extern int ZEXPORT unzStringFileNameCompare (fileName1,fileName2,iCaseSensitivity)
static int unzStringFileNameCompare (fileName1,fileName2,iCaseSensitivity)
const char* fileName1;
const char* fileName2;
int iCaseSensitivity;
@@ -901,48 +901,6 @@ typedef struct unz_file_pos_s
} unz_file_pos;
*/
extern int ZEXPORT unzGetFilePos(file, file_pos)
unzFile file;
unz_file_pos* file_pos;
{
unz_s* s;
if (file==NULL || file_pos==NULL)
return UNZ_PARAMERROR;
s=(unz_s*)file;
if (!s->current_file_ok)
return UNZ_END_OF_LIST_OF_FILE;
file_pos->pos_in_zip_directory = s->pos_in_central_dir;
file_pos->num_of_file = s->num_file;
return UNZ_OK;
}
extern int ZEXPORT unzGoToFilePos(file, file_pos)
unzFile file;
unz_file_pos* file_pos;
{
unz_s* s;
int err;
if (file==NULL || file_pos==NULL)
return UNZ_PARAMERROR;
s=(unz_s*)file;
/* jump to the right spot */
s->pos_in_central_dir = file_pos->pos_in_zip_directory;
s->num_file = file_pos->num_of_file;
/* set the current file */
err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
&s->cur_file_info_internal,
NULL,0,NULL,0,NULL,0);
/* return results */
s->current_file_ok = (err == UNZ_OK);
return err;
}
/*
// Unzip Helper Functions - should be here?
///////////////////////////////////////////
@@ -1193,13 +1151,6 @@ extern int ZEXPORT unzOpenCurrentFile (file)
return unzOpenCurrentFile3(file, NULL, NULL, 0, NULL);
}
extern int ZEXPORT unzOpenCurrentFilePassword (file, password)
unzFile file;
const char* password;
{
return unzOpenCurrentFile3(file, NULL, NULL, 0, password);
}
extern int ZEXPORT unzOpenCurrentFile2 (file,method,level,raw)
unzFile file;
int* method;
@@ -1573,23 +1524,3 @@ extern uLong ZEXPORT unzGetOffset (file)
return 0;
return s->pos_in_central_dir;
}
extern int ZEXPORT unzSetOffset (file, pos)
unzFile file;
uLong pos;
{
unz_s* s;
int err;
if (file==NULL)
return UNZ_PARAMERROR;
s=(unz_s*)file;
s->pos_in_central_dir = pos;
s->num_file = s->gi.number_entry; /* hack */
err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
&s->cur_file_info_internal,
NULL,0,NULL,0,NULL,0);
s->current_file_ok = (err == UNZ_OK);
return err;
}

View File

@@ -119,19 +119,6 @@ typedef struct unz_file_info_s
tm_unz tmu_date;
} unz_file_info;
extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1,
const char* fileName2,
int iCaseSensitivity));
/*
Compare two filename (fileName1,fileName2).
If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
or strcasecmp)
If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
(like 1 on Unix, 2 on Windows)
*/
extern unzFile ZEXPORT unzOpen OF((const char *path));
/*
Open a Zip file. path contain the full pathname (by example,
@@ -213,14 +200,6 @@ typedef struct unz_file_pos_s
uLong num_of_file; /* # of file */
} unz_file_pos;
extern int ZEXPORT unzGetFilePos(
unzFile file,
unz_file_pos* file_pos);
extern int ZEXPORT unzGoToFilePos(
unzFile file,
unz_file_pos* file_pos);
/* ****************************************** */
extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file,
@@ -255,14 +234,6 @@ extern int ZEXPORT unzOpenCurrentFile OF((unzFile file));
If there is no error, the return value is UNZ_OK.
*/
extern int ZEXPORT unzOpenCurrentFilePassword OF((unzFile file,
const char* password));
/*
Open for reading data the current file in the zipfile.
password is a crypting password
If there is no error, the return value is UNZ_OK.
*/
extern int ZEXPORT unzOpenCurrentFile2 OF((unzFile file,
int* method,
int* level,
@@ -316,36 +287,6 @@ extern z_off_t ZEXPORT unztell OF((unzFile file));
Give the current position in uncompressed data
*/
extern int ZEXPORT unzeof OF((unzFile file));
/*
return 1 if the end of file was reached, 0 elsewhere
*/
extern int ZEXPORT unzGetLocalExtrafield OF((unzFile file,
voidp buf,
unsigned len));
/*
Read extra field from the current file (opened by unzOpenCurrentFile)
This is the local-header version of the extra field (sometimes, there is
more info in the local-header version than in the central-header)
if buf==NULL, it return the size of the local extra field
if buf!=NULL, len is the size of the buffer, the extra header is copied in
buf.
the return value is the number of bytes copied in buf, or (if <0)
the error code
*/
/***************************************************************************/
/* Get the current file offset */
extern uLong ZEXPORT unzGetOffset (unzFile file);
/* Set the current file offset */
extern int ZEXPORT unzSetOffset (unzFile file, uLong pos);
#ifdef __cplusplus
}