Small refactor and simplification of library_t structure and box64context_t

1 files changed, 3 insertions, 3 deletions

diff --git a/src/librarian/librarian.c b/src/librarian/librarian.c
index cf5c9400..e871b68e 100755
--- a/src/librarian/librarian.c
+++ b/src/librarian/librarian.c
@@ -287,7 +287,7 @@ int AddNeededLib_add(lib_t* maplib, needed_libs_t* neededlibs, library_t* deplib
         return 1;
     }
 
-    if (lib->type == 1) {
+    if (lib->type == LIB_EMULATED) {
         // Need to add library to the linkmap (put here so the link is ordered)
         linkmap_t *lm = addLinkMapLib(lib);
         if(!lm) {
@@ -295,9 +295,9 @@ int AddNeededLib_add(lib_t* maplib, needed_libs_t* neededlibs, library_t* deplib
             printf_log(LOG_DEBUG, "Failure to add lib linkmap\n");
             return 1;
         }
-        lm->l_addr = (Elf64_Addr)GetElfDelta(my_context->elfs[lib->priv.n.elf_index]);
+        lm->l_addr = (Elf64_Addr)GetElfDelta(my_context->elfs[lib->e.elf_index]);
         lm->l_name = lib->name;
-        lm->l_ld = GetDynamicSection(my_context->elfs[lib->priv.n.elf_index]);
+        lm->l_ld = GetDynamicSection(my_context->elfs[lib->e.elf_index]);
     }
     return 0;
 }