[gtk: 2/2] Merge branch 'single-compilation-symbol' into 'master'



commit c5d24fc5cd6df252c0662b6c3cf44d18dfbd5d80
Merge: 965e37bee9 def700739d
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Nov 27 15:14:54 2019 +0000

    Merge branch 'single-compilation-symbol' into 'master'
    
    Use a single compilation symbol
    
    See merge request GNOME/gtk!1216

 gdk/broadway/gdkbroadwaycursor.h         |  4 ++--
 gdk/broadway/gdkbroadwaydisplay.h        |  4 ++--
 gdk/broadway/gdkbroadwaydisplaymanager.h |  4 ++--
 gdk/broadway/gdkbroadwaymonitor.h        |  2 +-
 gdk/broadway/gdkbroadwaysurface.h        |  2 +-
 gdk/broadway/gdkdnd-broadway.c           |  2 +-
 gdk/broadway/meson.build                 |  4 ++--
 gdk/gdk-autocleanup.h                    |  2 +-
 gdk/gdkapplaunchcontext.h                |  2 +-
 gdk/gdkcairo.h                           |  2 +-
 gdk/gdkcairocontext.h                    |  2 +-
 gdk/gdkclipboard.h                       |  2 +-
 gdk/gdkconfig.h.meson                    |  2 +-
 gdk/gdkconfig.h.win32                    |  2 +-
 gdk/gdkconfig.h.win32_vulkan             |  2 +-
 gdk/gdkcontentdeserializer.h             |  2 +-
 gdk/gdkcontentformats.h                  |  2 +-
 gdk/gdkcontentprovider.h                 |  2 +-
 gdk/gdkcontentproviderimpl.h             |  2 +-
 gdk/gdkcontentserializer.h               |  2 +-
 gdk/gdkcursor.h                          |  2 +-
 gdk/gdkdevice.h                          |  2 +-
 gdk/gdkdevicepad.h                       |  2 +-
 gdk/gdkdevicetool.h                      |  2 +-
 gdk/gdkdisplay.h                         |  2 +-
 gdk/gdkdisplaymanager.h                  |  2 +-
 gdk/gdkdrag.h                            |  2 +-
 gdk/gdkdrawcontext.h                     |  2 +-
 gdk/gdkdrop.h                            |  2 +-
 gdk/gdkenumtypes.h.template              |  2 +-
 gdk/gdkevents.h                          |  2 +-
 gdk/gdkframeclock.h                      |  2 +-
 gdk/gdkframetimings.h                    |  2 +-
 gdk/gdkglcontext.h                       |  2 +-
 gdk/gdkgltexture.h                       |  2 +-
 gdk/gdkkeys.h                            |  2 +-
 gdk/gdkmemorytexture.h                   |  2 +-
 gdk/gdkmonitor.h                         |  2 +-
 gdk/gdkpaintable.h                       |  2 +-
 gdk/gdkpango.h                           |  2 +-
 gdk/gdkpixbuf.h                          |  2 +-
 gdk/gdkproperty.h                        |  2 +-
 gdk/gdkrectangle.h                       |  2 +-
 gdk/gdkrgba.h                            |  2 +-
 gdk/gdkseat.h                            |  2 +-
 gdk/gdksnapshot.h                        |  2 +-
 gdk/gdksurface.h                         |  2 +-
 gdk/gdktexture.h                         |  2 +-
 gdk/gdktypes.h                           |  2 +-
 gdk/gdkversionmacros.h.in                |  2 +-
 gdk/gdkvulkancontext.h                   |  2 +-
 gdk/meson.build                          |  2 +-
 gdk/quartz/gdkquartzcursor.h             |  4 ++--
 gdk/quartz/gdkquartzdevice-core.h        |  2 +-
 gdk/quartz/gdkquartzdevicemanager-core.h |  2 +-
 gdk/quartz/gdkquartzdisplay.h            |  4 ++--
 gdk/quartz/gdkquartzdisplaymanager.h     |  4 ++--
 gdk/quartz/gdkquartzdnd.h                |  4 ++--
 gdk/quartz/gdkquartzkeys.h               |  4 ++--
 gdk/quartz/gdkquartzmonitor.h            |  2 +-
 gdk/quartz/gdkquartzscreen.h             |  2 +-
 gdk/quartz/gdkquartzsurface.h            |  4 ++--
 gdk/quartz/gdkquartzutils.h              |  2 +-
 gdk/quartz/meson.build                   |  2 +-
 gdk/wayland/gdkwaylanddevice.h           |  4 ++--
 gdk/wayland/gdkwaylanddisplay.h          |  4 ++--
 gdk/wayland/gdkwaylandglcontext.h        |  2 +-
 gdk/wayland/gdkwaylandmonitor.h          |  2 +-
 gdk/wayland/gdkwaylandsurface.h          |  4 ++--
 gdk/wayland/meson.build                  |  2 +-
 gdk/win32/gdkwin32cursor.h               |  4 ++--
 gdk/win32/gdkwin32display.h              |  4 ++--
 gdk/win32/gdkwin32displaymanager.h       |  4 ++--
 gdk/win32/gdkwin32dnd-private.h          |  2 +-
 gdk/win32/gdkwin32dnd.h                  |  4 ++--
 gdk/win32/gdkwin32glcontext.h            |  2 +-
 gdk/win32/gdkwin32keys.h                 |  4 ++--
 gdk/win32/gdkwin32misc.h                 |  4 ++--
 gdk/win32/gdkwin32monitor.h              |  4 ++--
 gdk/win32/gdkwin32screen.h               |  2 +-
 gdk/win32/gdkwin32surface.h              |  4 ++--
 gdk/win32/meson.build                    |  2 +-
 gdk/x11/gdkx-autocleanups.h              |  2 +-
 gdk/x11/gdkx11applaunchcontext.h         |  4 ++--
 gdk/x11/gdkx11device.h                   |  2 +-
 gdk/x11/gdkx11devicemanager.h            |  2 +-
 gdk/x11/gdkx11display.h                  |  4 ++--
 gdk/x11/gdkx11dnd.h                      |  4 ++--
 gdk/x11/gdkx11glcontext.h                |  2 +-
 gdk/x11/gdkx11keys.h                     |  4 ++--
 gdk/x11/gdkx11monitor.h                  |  2 +-
 gdk/x11/gdkx11property.h                 |  2 +-
 gdk/x11/gdkx11screen.h                   |  2 +-
 gdk/x11/gdkx11selection.h                |  2 +-
 gdk/x11/gdkx11surface.h                  |  4 ++--
 gdk/x11/gdkx11utils.h                    |  2 +-
 gdk/x11/meson.build                      |  2 +-
 gsk/gsk-autocleanup.h                    |  2 +-
 gsk/gskenums.h                           |  2 +-
 gsk/gskrenderer.h                        |  2 +-
 gsk/gskrendernode.h                      |  2 +-
 gsk/gskroundedrect.h                     |  2 +-
 gsk/gsktransform.h                       |  2 +-
 gsk/gsktypes.h                           |  2 +-
 gsk/meson.build                          |  2 +-
 gtk/a11y/gtkentryaccessible.c            |  1 -
 gtk/a11y/gtktextaccessible.c             |  1 -
 gtk/css/gtkcssenums.h                    |  2 +-
 gtk/css/gtkcssenumtypes.h.template       |  2 +-
 gtk/css/gtkcsslocation.h                 |  2 +-
 gtk/css/gtkcsssection.h                  |  2 +-
 gtk/css/meson.build                      |  2 +-
 gtk/meson.build                          | 16 +++++++---------
 testsuite/gtk/gestures.c                 |  2 +-
 114 files changed, 144 insertions(+), 148 deletions(-)
---


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