[cairo] [PATCH] Turn of Daemon mode in any2ppm on OS/2

Ginn Chen Ginn.Chen at Sun.COM
Tue Mar 3 03:03:27 PST 2009


OK, I think I did something wrong.
I tried again, it works for me.

BTW: I need another patch to get it work. The test program should not  
use private header.

diff --git a/test/truetype-tables.c b/test/truetype-tables.c
index bab119f..b1d48c3 100644
--- a/test/truetype-tables.c
+++ b/test/truetype-tables.c
@@ -29,8 +29,6 @@

  #include "cairo-test.h"

-#include <cairo-truetype-subset-private.h>
-
  static cairo_test_status_t
  preamble (cairo_test_context_t *ctx)
  {

On Mar 3, 2009, at 6:33 PM, Chris Wilson wrote:

> On Tue, 2009-03-03 at 18:01 +0800, Ginn Chen wrote:
>> Does it work if it is turned off?
>
> It should, without the daemon mode it prints an error message and the
> boilerplate just uses a fresh popen() for every conversion. At least
> that's how it works here...
>
> I've added another couple of checks for daemon() to any2ppm, hopefully
> this should correctly detect its absence on your systems.
>
>> From 694f2eea9feecfdc437e6964d1e758fab7315af9 Mon Sep 17 00:00:00  
>> 2001
> From: Chris Wilson <chris at chris-wilson.co.uk>
> Date: Tue, 3 Mar 2009 10:24:25 +0000
> Subject: [PATCH] [test/any2ppm] Add feature checks for daemon()
>
> Add the feature checks for the presence of the daemon() function call.
> ---
> test/any2ppm.c |    6 +++++-
> 1 files changed, 5 insertions(+), 1 deletions(-)
>
> diff --git a/test/any2ppm.c b/test/any2ppm.c
> index 7b3dabb..0149230 100644
> --- a/test/any2ppm.c
> +++ b/test/any2ppm.c
> @@ -77,7 +77,7 @@
> #include <libspectre/spectre.h>
> #endif
>
> -#if HAVE_FCNTL_H && HAVE_SIGNAL_H && HAVE_SYS_STAT_H &&
> HAVE_SYS_SOCKET_H && HAVE_SYS_POLL_H && HAVE_SYS_UN_H
> +#if HAVE_UNISTD_H && HAVE_FCNTL_H && HAVE_SIGNAL_H && HAVE_SYS_STAT_H
> && HAVE_SYS_SOCKET_H && HAVE_SYS_POLL_H && HAVE_SYS_UN_H
> #include <fcntl.h>
> #include <signal.h>
> #include <sys/stat.h>
> @@ -89,7 +89,11 @@
> #define SOCKET_PATH "./.any2ppm"
> #define TIMEOUT 60000 /* 60 seconds */
>
> +#if _BSD_SOURCE || (_XOPEN_SOURCE && _XOPEN_SOURCE < 500)
> #define CAN_RUN_AS_DAEMON 1
> +#else
> +#define CAN_RUN_AS_DAEMON 0
> +#endif
> #endif
>
> #define ARRAY_LENGTH(A) (sizeof (A) / sizeof (A[0]))
> -- 
> 1.6.0.4
>
>
>
> _______________________________________________
> cairo mailing list
> cairo at cairographics.org
> http://lists.cairographics.org/mailman/listinfo/cairo

--------
Ginn Chen
Software Engineer, Browser Team
Sun Microsystems, Inc.
Phone: x82869 / +86-10-62673869
Fax: +86-10-62780969




More information about the cairo mailing list