blob: 7d957434e874e7e23549e67d582a9cb5c958f248 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
|
From 4a292721bcf2943bfc05c6a1c859992f28e3efec Mon Sep 17 00:00:00 2001
From: Ryan Lortie <desrt@desrt.ca>
Date: Wed, 25 Mar 2015 09:29:49 -0400
Subject: [PATCH] GListModel: roll back use of type redefinition
We declare the typedefs for GListModel and GListStore in giotypes.h, as
a matter of convention. This is not actually required, since the
typedef is emitted as part of the G_DECLARE_* macros.
The giotypes.h approach is only used to avoid cyclic dependencies
between headers, which is not a problem in this case.
Type redefinition is a C11 feature, and although it was around in some
compilers before then, gcc 4.2.1 (from 2007) is apparently still in wide
use, being the default compiler for OpenBSD.
Eventually, we will probably hit a case where we actually need to
redefine a type, but since we're not there yet, let's back off a bit.
Upstream-Status: Backport
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
gio/giotypes.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/gio/giotypes.h b/gio/giotypes.h
index 4342d47..53f8cc9 100644
--- a/gio/giotypes.h
+++ b/gio/giotypes.h
@@ -61,8 +61,6 @@ typedef struct _GPermission GPermission;
typedef struct _GMenuModel GMenuModel;
typedef struct _GNotification GNotification;
-typedef struct _GListModel GListModel;
-typedef struct _GListStore GListStore;
/**
* GDrive:
--
1.7.9.5
|
