[gnome-software/cherry-pick-34e6a2fd] Merge branch 'musl-42-fix' into 'main'




commit ea6394e2456d115c9c19a8968ddd8f53bbc0d7a6
Author: Milan Crha <mcrha redhat com>
Date:   Tue May 3 06:54:10 2022 +0000

    Merge branch 'musl-42-fix' into 'main'
    
    gs-shell: only call malloc_trim with glibc
    
    See merge request GNOME/gnome-software!1336
    
    (cherry picked from commit 34e6a2fd0943d6c217c8c0228e7b5b2fbccf01c6)
    
    3eb1a37b gs-shell: only call malloc_trim with glibc

 src/gs-shell.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/src/gs-shell.c b/src/gs-shell.c
index ff2a142ed..db449a9b0 100644
--- a/src/gs-shell.c
+++ b/src/gs-shell.c
@@ -1078,8 +1078,10 @@ main_window_closed_cb (GtkWidget *dialog, gpointer user_data)
        gs_shell_clean_back_entry_stack (shell);
        gtk_widget_hide (dialog);
 
-       /* Free unused memory */
+#ifdef __GLIBC__
+       /* Free unused memory with GNU extension of malloc.h */
        malloc_trim (0);
+#endif
 
        return TRUE;
 }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]