Attachment 37729 Details for Bug 29460 – os: simplify ifdef

[patch] os: simplify ifdef

0007-os-simplify-ifdef.patch (text/plain), 1016 bytes, created by nobled on 2010-08-09 09:21:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: nobled

Created: 2010-08-09 09:21:27 UTC

Size: 1016 bytes

patch

obsolete

>From cd53f6d9a9e8ff62634ccdcf450dc1eb7124e5ca Mon Sep 17 00:00:00 2001
>From: nobled <nobled@dreamwidth.org>
>Date: Sun, 18 Jul 2010 16:08:19 +0000
>Subject: [PATCH] os: simplify ifdef
>
>The actual code that needs this include is just using
>"if defined (PIPE_OS_UNIX)", and the two conditions should match.
>
>This should also make the file compile under Hurd.
>---
> src/gallium/auxiliary/os/os_time.c |    2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
>diff --git a/src/gallium/auxiliary/os/os_time.c b/src/gallium/auxiliary/os/os_time.c
>index 8490721..325f316 100644
>--- a/src/gallium/auxiliary/os/os_time.c
>+++ b/src/gallium/auxiliary/os/os_time.c
>@@ -37,7 +37,7 @@
> 
> #if !defined(PIPE_OS_EMBEDDED)
> 
>-#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN)
>+#if defined(PIPE_OS_UNIX)
> #  include <sys/time.h> /* timeval */
> #elif defined(PIPE_SUBSYSTEM_WINDOWS_DISPLAY)
> #  include <windows.h>
>-- 
>1.5.4.3
>

Actions: View | Splinter Review

Attachments on bug 29460: 37727 | 37728 | 37729 | 38273 | 38531

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.