Ticket #67626: 00b44dababc4919bcb5959b1783e7a6ba3e01744.patch

File 00b44dababc4919bcb5959b1783e7a6ba3e01744.patch, 2.6 KB (added by ryandesign (Ryan Carsten Schmidt), 11 months ago)

  • mypaint-brush-settings.h 

    commit 00b44dababc4919bcb5959b1783e7a6ba3e01744
Author: Ryan Schmidt <git@ryandesign.com>
Date:   Wed Jun 14 13:32:07 2023 -0500

    Include glib.h not mypaint-glib-compat.h for glib
    
    When configured to use glib, always include glib.h instead of
    mypaint-glib-compat.h.
    
    Closes #71

diff --git a/mypaint-brush-settings.h b/mypaint-brush-settings.h
index f8c001e..f2ff868 100644
    a b  
    1818 */
    1919
    2020#include "mypaint-config.h"
     21#if MYPAINT_CONFIG_USE_GLIB
     22#include <glib.h>
     23#else // not MYPAINT_CONFIG_USE_GLIB
    2124#include "mypaint-glib-compat.h"
     25#endif
    2226#include "mypaint-brush-settings-gen.h"
    2327
    2428G_BEGIN_DECLS

  • mypaint-fixed-tiled-surface.h 

    diff --git a/mypaint-fixed-tiled-surface.h b/mypaint-fixed-tiled-surface.h
index 4d5bebe..08901f6 100644
    a b  
    22#define MYPAINTFIXEDTILEDSURFACE_H
    33
    44#include "mypaint-config.h"
     5#if MYPAINT_CONFIG_USE_GLIB
     6#include <glib.h>
     7#else // not MYPAINT_CONFIG_USE_GLIB
    58#include "mypaint-glib-compat.h"
     9#endif
    610#include "mypaint-tiled-surface.h"
    711
    812G_BEGIN_DECLS

  • mypaint-mapping.h 

    diff --git a/mypaint-mapping.h b/mypaint-mapping.h
index 3d8904e..2f77d87 100644
    a b  
    22#define MAPPING_H
    33
    44#include "mypaint-config.h"
     5#if MYPAINT_CONFIG_USE_GLIB
     6#include <glib.h>
     7#else // not MYPAINT_CONFIG_USE_GLIB
    58#include "mypaint-glib-compat.h"
     9#endif
    610
    711G_BEGIN_DECLS
    812

  • mypaint-rectangle.h 

    diff --git a/mypaint-rectangle.h b/mypaint-rectangle.h
index b0c889c..038271e 100644
    a b  
    1919 */
    2020
    2121#include "mypaint-config.h"
     22#if MYPAINT_CONFIG_USE_GLIB
     23#include <glib.h>
     24#else // not MYPAINT_CONFIG_USE_GLIB
    2225#include "mypaint-glib-compat.h"
     26#endif
    2327
    2428G_BEGIN_DECLS
    2529

  • mypaint-symmetry.h 

    diff --git a/mypaint-symmetry.h b/mypaint-symmetry.h
index b8930b5..af5e1b3 100644
    a b  
    1717 */
    1818
    1919#include "mypaint-matrix.h"
     20#if MYPAINT_CONFIG_USE_GLIB
     21#include <glib.h>
     22#else // not MYPAINT_CONFIG_USE_GLIB
    2023#include "mypaint-glib-compat.h"
     24#endif
    2125
    2226/**
    2327  * MyPaintSymmetryType: Enumeration of different kinds of symmetry

  • tests/mypaint-test-surface.h 

    diff --git a/tests/mypaint-test-surface.h b/tests/mypaint-test-surface.h
index e116aff..1ca3db1 100644
    a b  
    22#define MYPAINTTESTSURFACE_H
    33
    44#include "mypaint-surface.h"
     5#if MYPAINT_CONFIG_USE_GLIB
     6#include <glib.h>
     7#else // not MYPAINT_CONFIG_USE_GLIB
    58#include "mypaint-glib-compat.h"
     9#endif
    610
    711G_BEGIN_DECLS
    812