Skip to content

goo: Split GDir and GDirEntry out of gfile.h

Christian Persch requested to merge chpe/poppler:mr/gfile into master

This allows including gfile.h together with glib.h which has a conflicting GDir type.

As suggested in #370 (comment 28559) .

I do worry that since this is one of the installed 'xpdf headers', this may be deemed an API change (since you now need to include goo/gdir.h for GDir).

An alternative would be to split GooFile into a goo/GooFile.h header, GDir and GDirEntry into gdir.h, and make gfile.h a compat header that only includes gdir.h and GooFile.h. That would preserve the API, and then the users that need GooFile and include glib.h can include only goo/GooFile.h.

Merge request reports