From 3bd1f8e319cc5fc96c141dff052bcb41f525caed Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Thu, 16 Aug 2018 23:02:58 +0200 Subject: [PATCH] gfile: Enable inclusion together with glib.h GDir class name conflicts with a glib type. Surround its definition with GFILE_NO_GDIR, so that source code in glib/ can define that before including gfile.h and not get the conflict. --- goo/gfile.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/goo/gfile.h b/goo/gfile.h index 4ce805e..0f02180 100644 --- a/goo/gfile.h +++ b/goo/gfile.h @@ -175,6 +175,8 @@ private: // GDir and GDirEntry //------------------------------------------------------------------------ +#ifndef GFILE_NO_GDIR + class GDirEntry { public: @@ -220,4 +222,6 @@ private: #endif }; +#endif /* !GFILE_NO_GDIR */ + #endif -- 2.9.4