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
|
|
18 | 18 | */ |
19 | 19 | |
20 | 20 | #include "mypaint-config.h" |
| 21 | #if MYPAINT_CONFIG_USE_GLIB |
| 22 | #include <glib.h> |
| 23 | #else // not MYPAINT_CONFIG_USE_GLIB |
21 | 24 | #include "mypaint-glib-compat.h" |
| 25 | #endif |
22 | 26 | #include "mypaint-brush-settings-gen.h" |
23 | 27 | |
24 | 28 | G_BEGIN_DECLS |
diff --git a/mypaint-fixed-tiled-surface.h b/mypaint-fixed-tiled-surface.h
index 4d5bebe..08901f6 100644
a
|
b
|
|
2 | 2 | #define MYPAINTFIXEDTILEDSURFACE_H |
3 | 3 | |
4 | 4 | #include "mypaint-config.h" |
| 5 | #if MYPAINT_CONFIG_USE_GLIB |
| 6 | #include <glib.h> |
| 7 | #else // not MYPAINT_CONFIG_USE_GLIB |
5 | 8 | #include "mypaint-glib-compat.h" |
| 9 | #endif |
6 | 10 | #include "mypaint-tiled-surface.h" |
7 | 11 | |
8 | 12 | G_BEGIN_DECLS |
diff --git a/mypaint-mapping.h b/mypaint-mapping.h
index 3d8904e..2f77d87 100644
a
|
b
|
|
2 | 2 | #define MAPPING_H |
3 | 3 | |
4 | 4 | #include "mypaint-config.h" |
| 5 | #if MYPAINT_CONFIG_USE_GLIB |
| 6 | #include <glib.h> |
| 7 | #else // not MYPAINT_CONFIG_USE_GLIB |
5 | 8 | #include "mypaint-glib-compat.h" |
| 9 | #endif |
6 | 10 | |
7 | 11 | G_BEGIN_DECLS |
8 | 12 | |
diff --git a/mypaint-rectangle.h b/mypaint-rectangle.h
index b0c889c..038271e 100644
a
|
b
|
|
19 | 19 | */ |
20 | 20 | |
21 | 21 | #include "mypaint-config.h" |
| 22 | #if MYPAINT_CONFIG_USE_GLIB |
| 23 | #include <glib.h> |
| 24 | #else // not MYPAINT_CONFIG_USE_GLIB |
22 | 25 | #include "mypaint-glib-compat.h" |
| 26 | #endif |
23 | 27 | |
24 | 28 | G_BEGIN_DECLS |
25 | 29 | |
diff --git a/mypaint-symmetry.h b/mypaint-symmetry.h
index b8930b5..af5e1b3 100644
a
|
b
|
|
17 | 17 | */ |
18 | 18 | |
19 | 19 | #include "mypaint-matrix.h" |
| 20 | #if MYPAINT_CONFIG_USE_GLIB |
| 21 | #include <glib.h> |
| 22 | #else // not MYPAINT_CONFIG_USE_GLIB |
20 | 23 | #include "mypaint-glib-compat.h" |
| 24 | #endif |
21 | 25 | |
22 | 26 | /** |
23 | 27 | * MyPaintSymmetryType: Enumeration of different kinds of symmetry |
diff --git a/tests/mypaint-test-surface.h b/tests/mypaint-test-surface.h
index e116aff..1ca3db1 100644
a
|
b
|
|
2 | 2 | #define MYPAINTTESTSURFACE_H |
3 | 3 | |
4 | 4 | #include "mypaint-surface.h" |
| 5 | #if MYPAINT_CONFIG_USE_GLIB |
| 6 | #include <glib.h> |
| 7 | #else // not MYPAINT_CONFIG_USE_GLIB |
5 | 8 | #include "mypaint-glib-compat.h" |
| 9 | #endif |
6 | 10 | |
7 | 11 | G_BEGIN_DECLS |
8 | 12 | |