Mesa (master): util: Add support for Mac OS.

[Robert Noland]

On Thu, 2009-07-23 at 06:08 -0700, Jose Fonseca wrote:
> Module: Mesa
> Branch: master
> Commit: af1163cc415265e125b5aa5041ce5c75b978bb1a
> URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=af1163cc415265e125b5aa5041ce5c75b978bb1a
> 
> Author: Vinson Lee <vlee at vmware.com>
> Date:   Thu Jul 23 14:07:31 2009 +0100
> 
> util: Add support for Mac OS.

Should this maybe all get changed to PIPE_OS_UNIX or PIPE_OS_POSIX or
something?

robert.

> ---
> 
>  src/gallium/auxiliary/util/u_time.c |   12 ++++++------
>  src/gallium/auxiliary/util/u_time.h |    6 +++---
>  2 files changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/src/gallium/auxiliary/util/u_time.c b/src/gallium/auxiliary/util/u_time.c
> index 5268cbf..c16cdd0 100644
> --- a/src/gallium/auxiliary/util/u_time.c
> +++ b/src/gallium/auxiliary/util/u_time.c
> @@ -35,7 +35,7 @@
>  
>  #include "pipe/p_config.h"
>  
> -#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS)
> +#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE)
>  #include <sys/time.h>
>  #elif defined(PIPE_SUBSYSTEM_WINDOWS_DISPLAY)
>  #include <windows.h>
> @@ -77,7 +77,7 @@ util_time_get_frequency(void)
>  void 
>  util_time_get(struct util_time *t)
>  {
> -#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS)
> +#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE)
>     gettimeofday(&t->tv, NULL);
>  #elif defined(PIPE_SUBSYSTEM_WINDOWS_DISPLAY)
>     LONGLONG temp;
> @@ -102,7 +102,7 @@ util_time_add(const struct util_time *t1,
>                int64_t usecs,
>                struct util_time *t2)
>  {
> -#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS)
> +#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE)
>     t2->tv.tv_sec = t1->tv.tv_sec + usecs / 1000000;
>     t2->tv.tv_usec = t1->tv.tv_usec + usecs % 1000000;
>  #elif defined(PIPE_SUBSYSTEM_WINDOWS_DISPLAY) || defined(PIPE_SUBSYSTEM_WINDOWS_USER) || defined(PIPE_SUBSYSTEM_WINDOWS_CE)
> @@ -124,7 +124,7 @@ int64_t
>  util_time_diff(const struct util_time *t1, 
>                 const struct util_time *t2)
>  {
> -#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS)
> +#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE)
>     return (t2->tv.tv_usec - t1->tv.tv_usec) + 
>            (t2->tv.tv_sec - t1->tv.tv_sec)*1000000;
>  #elif defined(PIPE_SUBSYSTEM_WINDOWS_DISPLAY) || defined(PIPE_SUBSYSTEM_WINDOWS_USER) || defined(PIPE_SUBSYSTEM_WINDOWS_CE)
> @@ -144,7 +144,7 @@ util_time_micros( void )
>     
>     util_time_get(&t1);
>     
> -#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS)
> +#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE)
>     return t1.tv.tv_usec + t1.tv.tv_sec*1000000LL;
>  #elif defined(PIPE_SUBSYSTEM_WINDOWS_DISPLAY) || defined(PIPE_SUBSYSTEM_WINDOWS_USER) || defined(PIPE_SUBSYSTEM_WINDOWS_CE)
>     util_time_get_frequency();
> @@ -166,7 +166,7 @@ static INLINE int
>  util_time_compare(const struct util_time *t1, 
>                    const struct util_time *t2)
>  {
> -#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS)
> +#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE)
>     if (t1->tv.tv_sec < t2->tv.tv_sec)
>        return -1;
>     else if(t1->tv.tv_sec > t2->tv.tv_sec)
> diff --git a/src/gallium/auxiliary/util/u_time.h b/src/gallium/auxiliary/util/u_time.h
> index 6bca607..7a5c54d 100644
> --- a/src/gallium/auxiliary/util/u_time.h
> +++ b/src/gallium/auxiliary/util/u_time.h
> @@ -38,7 +38,7 @@
>  
>  #include "pipe/p_config.h"
>  
> -#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS)
> +#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE)
>  #include <time.h> /* timeval */
>  #include <unistd.h> /* usleep */
>  #endif
> @@ -58,7 +58,7 @@ extern "C" {
>   */
>  struct util_time 
>  {
> -#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS)
> +#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE)
>     struct timeval tv;
>  #else
>     int64_t counter;
> @@ -89,7 +89,7 @@ util_time_timeout(const struct util_time *start,
>                    const struct util_time *end,
>                    const struct util_time *curr);
>  
> -#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS)
> +#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE)
>  #define util_time_sleep usleep
>  #else
>  void
> 
> _______________________________________________
> mesa-commit mailing list
> mesa-commit at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-commit
-- 
Robert Noland <rnoland at 2hip.net>
2Hip Networks