From 4942a7b77917f9a163453ecdd040993965672cc0 Mon Sep 17 00:00:00 2001
From: Aaron Brashears <aaronb@lindenlab.com>
Date: Thu, 4 Oct 2007 16:31:48 +0000
Subject: Result of svn merge -r70873:71086
 svn+ssh://svn/svn/linden/branches/enable-exceptions into release.

---
 indra/llmath/llmath.h | 6 ------
 indra/llmath/v2math.h | 2 --
 2 files changed, 8 deletions(-)

(limited to 'indra/llmath')

diff --git a/indra/llmath/llmath.h b/indra/llmath/llmath.h
index 5fa74f30f2..21f9d2aeb8 100644
--- a/indra/llmath/llmath.h
+++ b/indra/llmath/llmath.h
@@ -9,12 +9,6 @@
 #ifndef LLMATH_H
 #define LLMATH_H
 
-#include <cmath>
-#include <math.h>
-#include <stdlib.h>
-
-#include "lldefs.h"
-
 // work around for Windows & older gcc non-standard function names.
 #if LL_WINDOWS
 #define llisnan(val)	_isnan(val)
diff --git a/indra/llmath/v2math.h b/indra/llmath/v2math.h
index 863318551e..f9af62f842 100644
--- a/indra/llmath/v2math.h
+++ b/indra/llmath/v2math.h
@@ -9,8 +9,6 @@
 #ifndef LL_V2MATH_H
 #define LL_V2MATH_H
 
-#include <math.h>
-
 #include "llmath.h"
 
 class LLVector4;
-- 
cgit v1.2.3