[x264-devel] commit: SPARC/Solaris build fixes (Sean McGovern )

[git at videolan.org]

x264 | branch: master | Sean McGovern <gseanmcg at gmail.com> | Fri Dec  3 22:30:51 2010 -0800| [3534560566940cdd143ae7b6e054980d09a359d7] | committer: Jason Garrett-Glaser 

SPARC/Solaris build fixes

> http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=3534560566940cdd143ae7b6e054980d09a359d7
---

 Makefile       |    2 +-
 common/osdep.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 6344ca4..ec7a7a3 100644
--- a/Makefile
+++ b/Makefile
@@ -109,7 +109,7 @@ endif
 endif
 
 # VIS optims
-ifeq ($(ARCH),UltraSparc)
+ifeq ($(ARCH),UltraSPARC)
 ifeq ($(findstring HIGH_BIT_DEPTH, $(CONFIG)),)
 ASMSRC += common/sparc/pixel.asm
 OBJASM  = $(ASMSRC:%.asm=%.o)
diff --git a/common/osdep.h b/common/osdep.h
index ce5c837..fbe8e96 100644
--- a/common/osdep.h
+++ b/common/osdep.h
@@ -50,7 +50,7 @@
 #include <fcntl.h> // _O_BINARY
 #endif
 
-#if (SYS_OPENBSD && !defined(isfinite)) || SYS_SunOS
+#if !defined(isfinite) && (SYS_OPENBSD || SYS_SunOS)
 #define isfinite finite
 #endif
 #ifdef _WIN32