File 0458-erts-Avoid-a-struct-name-clash-on-Solaris.patch of Package erlang
From 316a36720d03605ee8e7485ee09434b537121c1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20H=C3=B6gberg?= <john@erlang.org>
Date: Mon, 22 Jan 2024 19:11:13 +0100
Subject: [PATCH] erts: Avoid a struct name clash on Solaris
---
erts/emulator/beam/jit/beam_jit_metadata.cpp | 4 ++--
erts/etc/unix/jit-reader.c | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/erts/emulator/beam/jit/beam_jit_metadata.cpp b/erts/emulator/beam/jit/beam_jit_metadata.cpp
index 10e82fdf37..d8c8c16920 100644
--- a/erts/emulator/beam/jit/beam_jit_metadata.cpp
+++ b/erts/emulator/beam/jit/beam_jit_metadata.cpp
@@ -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;
@@ -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;
};
diff --git a/erts/etc/unix/jit-reader.c b/erts/etc/unix/jit-reader.c
index 4b2714222a..50005a1242 100644
--- a/erts/etc/unix/jit-reader.c
+++ b/erts/etc/unix/jit-reader.c
@@ -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;
@@ -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;
};
@@ -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;
--
2.35.3