summaryrefslogtreecommitdiff
path: root/indra/llmath
diff options
context:
space:
mode:
authorDave Houlton <euclid@lindenlab.com>2020-10-08 16:48:25 -0600
committerDave Houlton <euclid@lindenlab.com>2020-10-08 17:16:22 -0600
commit7cd076c796126692c308df5416b42b24a96609fb (patch)
tree2061ad71bfdf04be832d8213b3fee643e6aec2ca /indra/llmath
parent18ddd70d96dc572ad94c81f9a1a3d08d7c7cdbc7 (diff)
DRTVWR-510 remove all LL_SOLARIS conditionals
Diffstat (limited to 'indra/llmath')
-rw-r--r--indra/llmath/llmath.h3
-rw-r--r--indra/llmath/llsdutil_math.cpp2
2 files changed, 1 insertions, 4 deletions
diff --git a/indra/llmath/llmath.h b/indra/llmath/llmath.h
index 8f01ad6c1c..e4ccd81faf 100644
--- a/indra/llmath/llmath.h
+++ b/indra/llmath/llmath.h
@@ -47,9 +47,6 @@
#elif (LL_LINUX && __GNUC__ <= 2)
#define llisnan(val) isnan(val)
#define llfinite(val) isfinite(val)
-#elif LL_SOLARIS
-#define llisnan(val) isnan(val)
-#define llfinite(val) (val <= std::numeric_limits<double>::max())
#else
#define llisnan(val) std::isnan(val)
#define llfinite(val) std::isfinite(val)
diff --git a/indra/llmath/llsdutil_math.cpp b/indra/llmath/llsdutil_math.cpp
index 591f7fde36..51e5e3764f 100644
--- a/indra/llmath/llsdutil_math.cpp
+++ b/indra/llmath/llsdutil_math.cpp
@@ -40,7 +40,7 @@
#if LL_WINDOWS
# define WIN32_LEAN_AND_MEAN
# include <winsock2.h> // for htonl
-#elif LL_LINUX || LL_SOLARIS
+#elif LL_LINUX
# include <netinet/in.h>
#elif LL_DARWIN
# include <arpa/inet.h>