Small refactor and simplification of library_t structure and box64context_t

1 files changed, 8 insertions, 17 deletions

diff --git a/src/include/box64context.h b/src/include/box64context.h
index 5dc2399d..036a2b6d 100755
--- a/src/include/box64context.h
+++ b/src/include/box64context.h
@@ -136,23 +136,14 @@ typedef struct box64context_s {
     pthread_mutex_t     mutex_bridge;
 
     library_t           *libclib;       // shortcut to libc library (if loaded, so probably yes)
-    library_t           *sdl1lib;       // shortcut to SDL1 library (if loaded)
-    void*               sdl1allocrw;
-    void*               sdl1freerw;
     library_t           *sdl1mixerlib;
-    library_t           *sdl2lib;       // shortcut to SDL2 library (if loaded)
-    void*               sdl2allocrw;
-    void*               sdl2freerw;
+    library_t           *sdl2lib;
     library_t           *sdl2mixerlib;
-    library_t           *x11lib;
-    library_t           *zlib;
-    library_t           *vorbisfile;
-    library_t           *vorbis;
-    library_t           *asound;
-    library_t           *pulse;
-    library_t           *d3dadapter9;
-    library_t           *libglu;
     linkmap_t           *linkmap;
+    void*               sdl1allocrw;    // SDL1 AllocRW/FreeRW function
+    void*               sdl1freerw;
+    void*               sdl2allocrw;    // SDL2 AllocRW/FreeRW function
+    void*               sdl2freerw;
 
     int                 deferedInit;
     elfheader_t         **deferedInitList;
@@ -166,9 +157,9 @@ typedef struct box64context_s {
 
     uintptr_t           *auxval_start;
 
-    cleanup_t   *cleanups;          // atexit functions
-    int         clean_sz;
-    int         clean_cap;
+    cleanup_t           *cleanups;          // atexit functions
+    int                 clean_sz;
+    int                 clean_cap;
 
     zydis_dec_t         *dec;           // trace