[poppler] goo/gfile.cc goo/gfile.h

Albert Astals Cid aacid at kemper.freedesktop.org
Mon Apr 2 10:54:20 UTC 2018


 goo/gfile.cc |    6 ++----
 goo/gfile.h  |    2 ++
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit c19469f2a80ebc09bef3fbd603034e43c4a707cd
Author: Mojca Miklavec <mojca at macports.org>
Date:   Mon Apr 2 12:52:35 2018 +0200

    Fix build on some platforms
    
    We need to include time.h in gfile.h
    
    Bug #105766

diff --git a/goo/gfile.cc b/goo/gfile.cc
index 06014b3e..381a0ce2 100644
--- a/goo/gfile.cc
+++ b/goo/gfile.cc
@@ -26,6 +26,7 @@
 // Copyright (C) 2013 Peter Breitenlohner <peb at mppmu.mpg.de>
 // Copyright (C) 2013, 2017 Thomas Freitag <Thomas.Freitag at alfa.de>
 // Copyright (C) 2017 Christoph Cullmann <cullmann at kde.org>
+// Copyright (C) 2018 Mojca Miklavec <mojca at macports.org>
 //
 // To see a description of the changes please see the Changelog file that
 // came with your tarball or type make ChangeLog if you are building from git
@@ -34,9 +35,7 @@
 
 #include <config.h>
 
-#ifdef _WIN32
-#  include <time.h>
-#else
+#ifndef _WIN32
 #  if defined(MACOS)
 #    include <sys/stat.h>
 #  elif !defined(ACORN)
@@ -44,7 +43,6 @@
 #    include <sys/stat.h>
 #    include <fcntl.h>
 #  endif
-#  include <time.h>
 #  include <limits.h>
 #  include <string.h>
 #  if !defined(VMS) && !defined(ACORN) && !defined(MACOS)
diff --git a/goo/gfile.h b/goo/gfile.h
index 0741a92d..4ce805ee 100644
--- a/goo/gfile.h
+++ b/goo/gfile.h
@@ -24,6 +24,7 @@
 // Copyright (C) 2014 Peter Breitenlohner <peb at mppmu.mpg.de>
 // Copyright (C) 2017 Christoph Cullmann <cullmann at kde.org>
 // Copyright (C) 2017 Thomas Freitag <Thomas.Freitag at alfa.de>
+// Copyright (C) 2018 Mojca Miklavec <mojca at macports.org>
 //
 // To see a description of the changes please see the Changelog file that
 // came with your tarball or type make ChangeLog if you are building from git
@@ -37,6 +38,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
+#include <time.h>
 extern "C" {
 #if defined(_WIN32)
 #  include <sys/stat.h>


More information about the poppler mailing list