SPARC/Solaris build fixes

diff --git a/Makefile b/Makefile
index 6344ca4f0b622669716295d7ccba4bf3ddce61cd..ec7a7a3aa6b096e3ac808f5c0d7a260367637297 100644 (file)
--- 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 ce5c837b3e341d64e0686ccfe5a29a80ceeb0930..fbe8e96cc7fedd160b7d778b692683ad6c809bdd 100644 (file)
--- 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