Attachment 138376 Details for Bug 105766 – Add missing time.h plus minor cleanup

[patch] Add missing time.h plus minor cleanup

poppler-missing-time.h.patch (text/plain), 1.17 KB, created by Mojca Miklavec on 2018-03-27 12:17:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mojca Miklavec

Created: 2018-03-27 12:17:32 UTC

Size: 1.17 KB

patch

obsolete

>diff --git a/goo/gfile.cc b/goo/gfile.cc
>index 06014b3e..0c425319 100644
>--- a/goo/gfile.cc
>+++ b/goo/gfile.cc
>@@ -34,9 +34,7 @@
> 
> #include <config.h>
> 
>-#ifdef _WIN32
>-#  include <time.h>
>-#else
>+#ifndef _WIN32
> #  if defined(MACOS)
> #    include <sys/stat.h>
> #  elif !defined(ACORN)
>@@ -44,7 +42,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..436947b2 100644
>--- a/goo/gfile.h
>+++ b/goo/gfile.h
>@@ -37,6 +37,7 @@
> #include <stdio.h>
> #include <stdlib.h>
> #include <stddef.h>
>+#include <time.h>
> extern "C" {
> #if defined(_WIN32)
> #  include <sys/stat.h>
>@@ -49,8 +50,6 @@ extern "C" {
> #    include <windows.h>
> #  endif
> #elif defined(ACORN)
>-#elif defined(MACOS)
>-#  include <ctime.h>
> #else
> #  include <unistd.h>
> #  include <sys/types.h>
>diff --git a/poppler/Form.h b/poppler/Form.h
>index a4c59fb1..b6a16669 100644
>--- a/poppler/Form.h
>+++ b/poppler/Form.h
>@@ -30,8 +30,7 @@
> #include "Object.h"
> #include "Annot.h"
> 
>-#include <time.h>
>-
>+#include <ctime>
> #include <set>
> #include <vector>
>

Actions: View | Splinter Review

Attachments on bug 105766: 138376

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.