mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-14 06:59:53 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

update to master

Browse source
This commit is contained in:
Chengyi Zhao 2024-06-25 17:03:12 +08:00
parent 7138fa0272
commit fccb4bd29d
107 changed files with 29 additions and 51635 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/pulsecore/proplist-util.c
View file

@ -54,10 +54,6 @@ static const gchar* _g_get_application_name(void) PA_GCC_WEAKREF(g_get_applicati
static const gchar* _gtk_window_get_default_icon_name(void) PA_GCC_WEAKREF(gtk_window_get_default_icon_name);
#ifdef GDK_WINDOWING_X11
#include <gdk/gdkx.h>
<<<<<<< HEAD
static const gchar* _gtk_window_get_default_icon_name(void) PA_GCC_WEAKREF(gtk_window_get_default_icon_name);
=======
>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
static Display *_gdk_display PA_GCC_WEAKREF(gdk_display);
#endif
#endif