[SCM] A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids branch, master, updated. upstream/1.20.12-55-g5b64f45

[Robin Cornelius]

The following commit has been merged in the master branch:
commit 5b64f45b6178dc77bf1a5497ccc1435c5836e200
Author: Robin Cornelius <robin.cornelius at gmail.com>
Date:   Wed Jul 16 23:30:08 2008 +0200

    Stupid trival build fixes that are included on SVN head

diff --git a/debian/patches/00list b/debian/patches/00list
index d1e93be..38ad0bc 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -77,3 +77,4 @@ VWR-7271_fix_mutlist_for_amd64.dpatch
 VWR-7831_smart_pointer_explicit_casting.dpatch
 
 VWR-5082_set_bulk_inv_permissions.dpatch
+VWR-4981_save_windlight_settings_in_user_rw_area.dpatch
diff --git a/indra/llcommon/llhash.h b/indra/llcommon/llhash.h
index 716d9df..af6a780 100644
--- a/indra/llcommon/llhash.h
+++ b/indra/llcommon/llhash.h
@@ -38,7 +38,9 @@
 #include <hash_map>
 #include <algorithm>
 #elif LL_DARWIN || LL_LINUX
-#  if GCC_VERSION >= 30400 // gcc 3.4 and up
+#  if GCC_VERSION >= 40300 // gcc 4.3 and up 
+#    include <backward/hashtable.h> 
+#  elif GCC_VERSION >= 30400 // gcc 3.4 and up 
 #    include <ext/hashtable.h>
 #  elif __GNUC__ >= 3
 #    include <ext/stl_hashtable.h>
diff --git a/indra/llmath/llmath.h b/indra/llmath/llmath.h
index 4a6358d..4db9589 100644
--- a/indra/llmath/llmath.h
+++ b/indra/llmath/llmath.h
@@ -36,6 +36,8 @@
 //#include <math.h>
 //#include <stdlib.h>
 #include "lldefs.h"
+#include <cstdlib>
+
 
 // work around for Windows & older gcc non-standard function names.
 #if LL_WINDOWS
diff --git a/indra/llmedia/llmediaimplexample1.cpp b/indra/llmedia/llmediaimplexample1.cpp
index 03e8291..41e5c50 100644
--- a/indra/llmedia/llmediaimplexample1.cpp
+++ b/indra/llmedia/llmediaimplexample1.cpp
@@ -36,7 +36,8 @@
 static LLMediaImplRegister sLLMediaImplExample1Reg( "LLMediaImplExample1", new LLMediaImplExample1Maker() );
 
 #include <iostream>
-
+#include <stdio.h>
+#include <string.h>
 #include <time.h>
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/indra/llmedia/llmediaimplexample2.cpp b/indra/llmedia/llmediaimplexample2.cpp
index dc20e03..ba1adcd 100644
--- a/indra/llmedia/llmediaimplexample2.cpp
+++ b/indra/llmedia/llmediaimplexample2.cpp
@@ -37,6 +37,9 @@ static LLMediaImplRegister sLLMediaImplExample2Reg( "LLMediaImplExample2", new L
 
 #include <iostream>
 #include <time.h>
+#include <stdio.h>
+#include <string.h>
+
 
 ///////////////////////////////////////////////////////////////////////////////
 //

-- 
A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids