[gimp] Don't #include <glib.h> before <lcms.h>
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] Don't #include <glib.h> before <lcms.h>
- Date: Thu, 10 Apr 2014 18:50:53 +0000 (UTC)
commit 614c61a3dd19eacb00149f094aca930d30c333b0
Author: Michael Natterer <mitch gimp org>
Date: Thu Apr 10 20:48:22 2014 +0200
Don't #include <glib.h> before <lcms.h>
The include claimed to be because of "inline" in the lcms header, but
that was probably lcms1, since there is no trace of inline in the
lcms2 header.
app/core/gimpimage-profile.c | 2 --
app/widgets/gimpimageprofileview.c | 2 --
libgimpcolor/gimplcms.c | 2 --
libgimpwidgets/gimpcolorprofilechooserdialog.c | 2 --
libgimpwidgets/gimpcolorprofilecombobox.c | 2 --
libgimpwidgets/gimpcolorprofileview.c | 2 --
modules/color-selector-cmyk.c | 2 --
modules/display-filter-lcms.c | 2 --
modules/display-filter-proof.c | 2 --
plug-ins/common/lcms.c | 2 --
10 files changed, 0 insertions(+), 20 deletions(-)
---
diff --git a/app/core/gimpimage-profile.c b/app/core/gimpimage-profile.c
index 958e090..4044ea8 100644
--- a/app/core/gimpimage-profile.c
+++ b/app/core/gimpimage-profile.c
@@ -19,8 +19,6 @@
#include <string.h>
-#include <glib.h> /* lcms.h uses the "inline" keyword */
-
#include <lcms2.h>
#include <cairo.h>
diff --git a/app/widgets/gimpimageprofileview.c b/app/widgets/gimpimageprofileview.c
index 0ec9cd2..bc223ed 100644
--- a/app/widgets/gimpimageprofileview.c
+++ b/app/widgets/gimpimageprofileview.c
@@ -22,8 +22,6 @@
#include <string.h>
-#include <glib.h> /* lcms.h uses the "inline" keyword */
-
#include <lcms2.h>
#include <gegl.h>
diff --git a/libgimpcolor/gimplcms.c b/libgimpcolor/gimplcms.c
index af08419..83b9da9 100644
--- a/libgimpcolor/gimplcms.c
+++ b/libgimpcolor/gimplcms.c
@@ -24,8 +24,6 @@
#include <string.h>
-#include <glib.h> /* lcms.h uses the "inline" keyword */
-
#include <lcms2.h>
#include <gio/gio.h>
diff --git a/libgimpwidgets/gimpcolorprofilechooserdialog.c b/libgimpwidgets/gimpcolorprofilechooserdialog.c
index 392d5f7..f1385bb 100644
--- a/libgimpwidgets/gimpcolorprofilechooserdialog.c
+++ b/libgimpwidgets/gimpcolorprofilechooserdialog.c
@@ -23,8 +23,6 @@
#include <string.h>
-#include <glib.h> /* lcms.h uses the "inline" keyword */
-
#include <lcms2.h>
#include <gegl.h>
diff --git a/libgimpwidgets/gimpcolorprofilecombobox.c b/libgimpwidgets/gimpcolorprofilecombobox.c
index 8a6abc4..45a4bad 100644
--- a/libgimpwidgets/gimpcolorprofilecombobox.c
+++ b/libgimpwidgets/gimpcolorprofilecombobox.c
@@ -21,8 +21,6 @@
#include "config.h"
-#include <glib.h> /* lcms.h uses the "inline" keyword */
-
#include <lcms2.h>
#include <gegl.h>
diff --git a/libgimpwidgets/gimpcolorprofileview.c b/libgimpwidgets/gimpcolorprofileview.c
index 95cfd25..49ef45e 100644
--- a/libgimpwidgets/gimpcolorprofileview.c
+++ b/libgimpwidgets/gimpcolorprofileview.c
@@ -22,8 +22,6 @@
#include <string.h>
-#include <glib.h> /* lcms.h uses the "inline" keyword */
-
#include <lcms2.h>
#include <gegl.h>
diff --git a/modules/color-selector-cmyk.c b/modules/color-selector-cmyk.c
index 3a9074e..b064d52 100644
--- a/modules/color-selector-cmyk.c
+++ b/modules/color-selector-cmyk.c
@@ -17,8 +17,6 @@
#include "config.h"
-#include <glib.h> /* lcms.h uses the "inline" keyword */
-
#include <lcms2.h>
#include <gegl.h>
diff --git a/modules/display-filter-lcms.c b/modules/display-filter-lcms.c
index 7d36fce..c6c7c4e 100644
--- a/modules/display-filter-lcms.c
+++ b/modules/display-filter-lcms.c
@@ -17,8 +17,6 @@
#include "config.h"
-#include <glib.h> /* lcms.h uses the "inline" keyword */
-
#include <string.h>
#ifdef G_OS_WIN32
diff --git a/modules/display-filter-proof.c b/modules/display-filter-proof.c
index 839c0a5..b92aaae 100644
--- a/modules/display-filter-proof.c
+++ b/modules/display-filter-proof.c
@@ -17,8 +17,6 @@
#include "config.h"
-#include <glib.h> /* lcms.h uses the "inline" keyword */
-
#include <lcms2.h>
#include <gegl.h>
diff --git a/plug-ins/common/lcms.c b/plug-ins/common/lcms.c
index 68ba439..fa56722 100644
--- a/plug-ins/common/lcms.c
+++ b/plug-ins/common/lcms.c
@@ -22,8 +22,6 @@
#include <string.h>
-#include <glib.h> /* lcms.h uses the "inline" keyword */
-
#include <lcms2.h>
#include <libgimp/gimp.h>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]