1 |
Author: fwang |
2 |
Subject: Build fix: Fix glib header inclusion |
3 |
Applied-Upstream: commit:30602 |
4 |
Forwarded: yes |
5 |
Bug: http://bugzilla.abisource.com/show_bug.cgi?id=13247 |
6 |
|
7 |
--- goffice-bits/goffice/app/goffice-app.h.glib 2011-11-25 16:03:34.174789292 +0800 |
8 |
+++ goffice-bits/goffice/app/goffice-app.h 2011-11-25 16:03:41.994773077 +0800 |
9 |
@@ -22,7 +22,7 @@ |
10 |
#ifndef GOFFICE_APP_H |
11 |
#define GOFFICE_APP_H |
12 |
|
13 |
-#include <glib/gmacros.h> |
14 |
+#include <glib.h> |
15 |
|
16 |
G_BEGIN_DECLS |
17 |
|
18 |
--- goffice-bits2/goffice/app/goffice-app.h.glib 2011-11-25 16:03:46.674788343 +0800 |
19 |
+++ goffice-bits2/goffice/app/goffice-app.h 2011-11-25 16:03:54.044789574 +0800 |
20 |
@@ -22,7 +22,7 @@ |
21 |
#ifndef GOFFICE_APP_H |
22 |
#define GOFFICE_APP_H |
23 |
|
24 |
-#include <glib/gmacros.h> |
25 |
+#include <glib.h> |
26 |
|
27 |
G_BEGIN_DECLS |
28 |
|
29 |
--- src/af/util/xp/ut_go_file.h.glib 2011-11-25 16:15:20.746058195 +0800 |
30 |
+++ src/af/util/xp/ut_go_file.h 2011-11-25 16:15:27.184659115 +0800 |
31 |
@@ -31,7 +31,6 @@ |
32 |
|
33 |
#include <glib.h> |
34 |
#include <gsf/gsf.h> |
35 |
-#include <glib/gerror.h> |
36 |
#include <time.h> |
37 |
|
38 |
G_BEGIN_DECLS |