projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2d422a6)
os: simplify ifdef
authornobled <nobled@dreamwidth.org>
Sun, 18 Jul 2010 16:08:19 +0000 (16:08 +0000)
committerJon TURNEY <jon.turney@dronecode.org.uk>
Wed, 27 Apr 2011 10:35:02 +0000 (11:35 +0100)
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 patch | blob | history

diff --git a/src/gallium/auxiliary/os/os_time.c b/src/gallium/auxiliary/os/os_time.c
index 84907215fe6ced1fd642d39cffeb3c80cd3ed373..325f316784c0d850687be0a84d0a6e05f60e863b 100644 (file)
--- 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>