Mesa (master): os: simplify ifdef

Jon TURNEY jturney at kemper.freedesktop.org
Wed Apr 27 03:39:29 PDT 2011


Module: Mesa
Branch: master
Commit: 39cd791f3428ab48723fd4c73c4b1223e883ab2d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=39cd791f3428ab48723fd4c73c4b1223e883ab2d

Author: nobled <nobled at dreamwidth.org>
Date:   Sun Jul 18 16:08:19 2010 +0000

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>



More information about the mesa-commit mailing list