Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[cxx] Types need to be unique in Wasm. #10091

Merged
merged 1 commit into from Aug 14, 2018
Merged

[cxx] Types need to be unique in Wasm. #10091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions mono/eglib/gmarkup.c
View file
Open in desktop
Expand Up @@ -53,13 +53,13 @@ typedef enum {
CLOSING_ELEMENT,
COMMENT,
SKIP_XML_DECLARATION
} ParseState;
} MonoGMarkupParseState;

struct _GMarkupParseContext {
GMarkupParser parser;
gpointer user_data;
GDestroyNotify user_data_dnotify;
ParseState state;
MonoGMarkupParseState state;

/* Stores the name of the current element, so we can issue the end_element */
GSList *level;
Expand Down
24 changes: 12 additions & 12 deletions mono/metadata/mono-config.c
View file
Open in desktop
Expand Up @@ -194,7 +194,7 @@ typedef struct {
void *user_data;
MonoImage *assembly;
int inited;
} ParseState;
} MonoConfigParseState;

static void start_element (GMarkupParseContext *context,
const gchar *element_name,
Expand All @@ -203,7 +203,7 @@ static void start_element (GMarkupParseContext *context,
gpointer user_data,
GError **gerror)
{
ParseState *state = (ParseState *)user_data;
MonoConfigParseState *state = (MonoConfigParseState *)user_data;
if (!state->current) {
state->current = (MonoParseHandler *)g_hash_table_lookup (config_handlers, element_name);
if (state->current && state->current->init)
Expand All @@ -218,7 +218,7 @@ static void end_element (GMarkupParseContext *context,
gpointer user_data,
GError **gerror)
{
ParseState *state = (ParseState *)user_data;
MonoConfigParseState *state = (MonoConfigParseState *)user_data;
if (state->current) {
if (state->current->end)
state->current->end (state->user_data, element_name);
Expand All @@ -237,7 +237,7 @@ static void parse_text (GMarkupParseContext *context,
gpointer user_data,
GError **gerror)
{
ParseState *state = (ParseState *)user_data;
MonoConfigParseState *state = (MonoConfigParseState *)user_data;
if (state->current && state->current->text)
state->current->text (state->user_data, text, text_len);
}
Expand All @@ -255,7 +255,7 @@ static void parse_error (GMarkupParseContext *context,
GError *gerror,
gpointer user_data)
{
ParseState *state = (ParseState *)user_data;
MonoConfigParseState *state = (MonoConfigParseState *)user_data;
const gchar *msg;
const gchar *filename;

Expand Down Expand Up @@ -482,7 +482,7 @@ mono_config_cleanup (void)
/* FIXME: error handling */

static void
mono_config_parse_xml_with_context (ParseState *state, const char *text, gsize len)
mono_config_parse_xml_with_context (MonoConfigParseState *state, const char *text, gsize len)
{
GMarkupParseContext *context;

Expand All @@ -498,7 +498,7 @@ mono_config_parse_xml_with_context (ParseState *state, const char *text, gsize l

/* If assembly is NULL, parse in the global context */
static int
mono_config_parse_file_with_context (ParseState *state, const char *filename)
mono_config_parse_file_with_context (MonoConfigParseState *state, const char *filename)
{
gchar *text;
gsize len;
Expand Down Expand Up @@ -528,7 +528,7 @@ mono_config_parse_file_with_context (ParseState *state, const char *filename)
void
mono_config_parse_memory (const char *buffer)
{
ParseState state = {NULL};
MonoConfigParseState state = {NULL};

state.user_data = (gpointer) "<buffer>";
mono_config_parse_xml_with_context (&state, buffer, strlen (buffer));
Expand All @@ -537,7 +537,7 @@ mono_config_parse_memory (const char *buffer)
static void
mono_config_parse_file (const char *filename)
{
ParseState state = {NULL};
MonoConfigParseState state = {NULL};
state.user_data = (gpointer) filename;
mono_config_parse_file_with_context (&state, filename);
}
Expand Down Expand Up @@ -618,7 +618,7 @@ mono_config_for_assembly_internal (MonoImage *assembly)
{
MONO_REQ_GC_UNSAFE_MODE;

ParseState state = {NULL};
MonoConfigParseState state = {NULL};
int got_it = 0, i;
char *aname, *cfg, *cfg_name;
const char *bundled_config;
Expand Down Expand Up @@ -883,7 +883,7 @@ mono_config_parse_publisher_policy (const gchar *filename, MonoAssemblyBindingIn
NULL,
NULL
};
ParseState state = {
MonoConfigParseState state = {
&publisher_policy_parser, /* MonoParseHandler */
&user_data, /* user_data */
NULL, /* MonoImage (we don't need it right now)*/
Expand All @@ -908,7 +908,7 @@ mono_config_parse_assembly_bindings (const char *filename, int amajor, int amino
{
MonoAssemblyBindingInfo info;
ParserUserData pud;
ParseState state;
MonoConfigParseState state;

info.major = amajor;
info.minor = aminor;
Expand Down