Imported Upstream version 5.18.0.142

Former-commit-id: 7467d4b717762eeaf652d77f1486dd11ffb1ff1f
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-10-09 08:20:59 +00:00
parent e52655b4dc
commit 0abdbe5a7d
1547 changed files with 93792 additions and 47893 deletions

View File

@@ -230,6 +230,8 @@ CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CXX_ADD_CFLAGS = @CXX_ADD_CFLAGS@
CXX_REMOVE_CFLAGS = @CXX_REMOVE_CFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFAULT_PROFILE = @DEFAULT_PROFILE@
DEFS = @DEFS@
@@ -245,6 +247,7 @@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
EXTERNAL_LLVM_CONFIG = @EXTERNAL_LLVM_CONFIG@
FGREP = @FGREP@
GDKX11 = @GDKX11@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -285,11 +288,7 @@ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIPO = @LIPO@
LLVM_CFLAGS = @LLVM_CFLAGS@
LLVM_CONFIG = @LLVM_CONFIG@
LLVM_CXXFLAGS = @LLVM_CXXFLAGS@
LLVM_LDFLAGS = @LLVM_LDFLAGS@
LLVM_LIBS = @LLVM_LIBS@
LLVM_CODEGEN_LIBS = @LLVM_CODEGEN_LIBS@
LN_S = @LN_S@
LTCOMPILE = @LTCOMPILE@
LTCXXCOMPILE = @LTCXXCOMPILE@

View File

@@ -205,12 +205,9 @@
#define g_string_append_unichar monoeg_g_string_append_unichar
#define g_string_append_printf monoeg_g_string_append_printf
#define g_string_append_vprintf monoeg_g_string_append_vprintf
#define g_string_erase monoeg_g_string_erase
#define g_string_free monoeg_g_string_free
#define g_string_insert monoeg_g_string_insert
#define g_string_new monoeg_g_string_new
#define g_string_new_len monoeg_g_string_new_len
#define g_string_prepend monoeg_g_string_prepend
#define g_string_printf monoeg_g_string_printf
#define g_string_set_size monoeg_g_string_set_size
#define g_string_sized_new monoeg_g_string_sized_new

View File

@@ -99,6 +99,12 @@ typedef guint32 gunichar;
#define G_MAXUSHORT USHRT_MAX
#define G_MAXINT INT_MAX
#define G_MININT INT_MIN
#define G_MAXINT8 INT8_MAX
#define G_MAXUINT8 UINT8_MAX
#define G_MININT8 INT8_MIN
#define G_MAXINT16 INT16_MAX
#define G_MAXUINT16 UINT16_MAX
#define G_MININT16 INT16_MIN
#define G_MAXINT32 INT32_MAX
#define G_MAXUINT32 UINT32_MAX
#define G_MININT32 INT32_MIN
@@ -304,10 +310,7 @@ GString *g_string_append_c (GString *string, gchar c);
GString *g_string_append (GString *string, const gchar *val);
GString *g_string_append_len (GString *string, const gchar *val, gssize len);
GString *g_string_truncate (GString *string, gsize len);
GString *g_string_prepend (GString *string, const gchar *val);
GString *g_string_insert (GString *string, gssize pos, const gchar *val);
GString *g_string_set_size (GString *string, gsize len);
GString *g_string_erase (GString *string, gssize pos, gssize len);
#define g_string_sprintfa g_string_append_printf

View File

@@ -187,7 +187,7 @@ to_android_priority (GLogLevelFlags log_level)
#define LOG_MESSAGE_MAX_LEN 4096
static void
android_log_line (gint log_priority, const gchar *log_domain, gchar *log_message, gint log_len)
android_log_line (gint log_priority, const gchar *log_domain, const gchar *log_message, gint log_len)
{
gchar log_buf [LOG_MESSAGE_MAX_LEN];
@@ -204,7 +204,7 @@ static void
android_log (gint log_priority, const gchar *log_domain, const gchar *log_message)
{
gint log_message_len, log_message_p_len;
gchar *log_message_p;
const gchar *log_message_p;
log_message_len = strlen (log_message);
if (log_message_len <= LOG_MESSAGE_MAX_LEN) {
@@ -213,7 +213,7 @@ android_log (gint log_priority, const gchar *log_domain, const gchar *log_messag
}
for (log_message_p = log_message; log_message_p < log_message + log_message_len;) {
gchar *p = strstr (log_message_p, "\n");
const gchar *p = strstr (log_message_p, "\n");
if (p == NULL) {
/* There is no more "\n". */
android_log_line (log_priority, log_domain, log_message_p, LOG_MESSAGE_MAX_LEN - 1);

View File

@@ -80,7 +80,9 @@
* arm-apple-darwin9. We'll manually define the symbol on Apple as it does
* in fact exist on all implementations (so far)
*/
G_BEGIN_DECLS
gchar ***_NSGetEnviron(void);
G_END_DECLS
#define environ (*_NSGetEnviron())
#else
static char *mono_environ[1] = { NULL };
@@ -89,7 +91,9 @@ static char *mono_environ[1] = { NULL };
#elif defined(_MSC_VER)
/* MS defines this in stdlib.h */
#else
G_BEGIN_DECLS
extern char **environ;
G_END_DECLS
#endif
#ifndef G_OS_WIN32
@@ -477,7 +481,8 @@ g_spawn_async_with_pipes (const gchar *working_directory,
}
execve (arg0, actual_args, envp);
write_all (info_pipe [1], &errno, sizeof (int));
int const err = errno;
write_all (info_pipe [1], &err, sizeof (int));
exit (0);
}
} else if ((flags & G_SPAWN_DO_NOT_REAP_CHILD) == 0) {

View File

@@ -146,41 +146,6 @@ g_string_append_unichar (GString *string, gunichar c)
return g_string_append_len (string, utf8, len);
}
GString *
g_string_prepend (GString *string, const gchar *val)
{
gssize len;
g_return_val_if_fail (string != NULL, string);
g_return_val_if_fail (val != NULL, string);
len = strlen (val);
GROW_IF_NECESSARY(string, len);
memmove(string->str + len, string->str, string->len + 1);
memcpy(string->str, val, len);
return string;
}
GString *
g_string_insert (GString *string, gssize pos, const gchar *val)
{
gssize len;
g_return_val_if_fail (string != NULL, string);
g_return_val_if_fail (val != NULL, string);
g_return_val_if_fail (pos <= string->len, string);
len = strlen (val);
GROW_IF_NECESSARY(string, len);
memmove(string->str + pos + len, string->str + pos, string->len - pos - len + 1);
memcpy(string->str + pos, val, len);
return string;
}
void
g_string_append_printf (GString *string, const gchar *format, ...)
{
@@ -254,23 +219,3 @@ g_string_set_size (GString *string, gsize len)
string->str[len] = 0;
return string;
}
GString *
g_string_erase (GString *string, gssize pos, gssize len)
{
g_return_val_if_fail (string != NULL, string);
/* Silent return */
if (pos >= string->len)
return string;
if (len == -1 || (pos + len) >= string->len) {
string->str[pos] = 0;
}
else {
memmove (string->str + pos, string->str + pos + len, string->len - (pos + len) + 1);
string->len -= len;
}
return string;
}