Skip to content

Commit

Permalink
erts: Avoid a struct name clash on Solaris
Browse files Browse the repository at this point in the history
  • Loading branch information
jhogberg committed Jan 22, 2024
1 parent 8c0ea6b commit 316a367
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions erts/emulator/beam/jit/beam_jit_metadata.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ struct emulator_info {
const void *normal_exit;
};

struct module_info {
struct erlang_module_info {
uint64_t base_address;
uint32_t range_count;
uint32_t code_size;
Expand Down Expand Up @@ -106,7 +106,7 @@ struct debug_info {
enum debug_info_header header;
union {
struct emulator_info emu;
struct module_info mod;
struct erlang_module_info mod;
} payload;
};

Expand Down
6 changes: 3 additions & 3 deletions erts/etc/unix/jit-reader.c
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ struct emulator_info {
const void *normal_exit;
};

struct module_info {
struct erlang_module_info {
uint64_t base_address;
uint32_t range_count;
uint32_t code_size;
Expand Down Expand Up @@ -80,7 +80,7 @@ struct debug_info {
enum debug_info_header header;
union {
struct emulator_info emu;
struct module_info mod;
struct erlang_module_info mod;
} payload;
};

Expand All @@ -101,7 +101,7 @@ typedef struct priv {

static enum gdb_status read_module_info(struct gdb_reader_funcs *self,
struct gdb_symbol_callbacks *cb,
struct module_info *module_info) {
struct erlang_module_info *module_info) {
struct gdb_object *obj = cb->object_open(cb);
GDB_CORE_ADDR mod_start, mod_end;
char *symfile = (char*)module_info;
Expand Down

0 comments on commit 316a367

Please sign in to comment.