Attachment #156521 for bug #127026

View | Details | Raw Unified | Return to bug 127026 | Differences between

and this patch

Lines 36-41 Link Here

(-)linden/indra/llmedia/llmediaimplexample1.cpp (+1 lines)
36	static LLMediaImplRegister sLLMediaImplExample1Reg( "LLMediaImplExample1", new LLMediaImplExample1Maker() );	36	static LLMediaImplRegister sLLMediaImplExample1Reg( "LLMediaImplExample1", new LLMediaImplExample1Maker() );
37		37
38	#include <iostream>	38	#include <iostream>
		39	#include <string.h>
39		40
40	#include <time.h>	41	#include <time.h>
41		42

Lines 35-40 Link Here

(-)linden/indra/llmedia/llmediaimplexample2.cpp.1 (+1 lines)
35	// register this impl with media manager factory	35	// register this impl with media manager factory
36	static LLMediaImplRegister sLLMediaImplExample2Reg( "LLMediaImplExample2", new LLMediaImplExample2Maker() );	36	static LLMediaImplRegister sLLMediaImplExample2Reg( "LLMediaImplExample2", new LLMediaImplExample2Maker() );
37		37
		38	#include <string.h>
38	#include <iostream>	39	#include <iostream>
39	#include <time.h>	40	#include <time.h>
40		41

Lines 38-44 Link Here

(-)linden/indra/llcommon/llhash.h.1 (-1 / +3 lines)
38	#include <hash_map>	38	#include <hash_map>
39	#include <algorithm>	39	#include <algorithm>
40	#elif LL_DARWIN \|\| LL_LINUX	40	#elif LL_DARWIN \|\| LL_LINUX
41	# if GCC_VERSION >= 30400 // gcc 3.4 and up	41	# if GCC_VERSION >= 40300 // gcc 4.3 and up
		42	# include <backward/hashtable.h>
		43	# elif GCC_VERSION >= 30400 // gcc 3.4 and up
42	# include <ext/hashtable.h>	44	# include <ext/hashtable.h>
43	# elif __GNUC__ >= 3	45	# elif __GNUC__ >= 3
44	# include <ext/stl_hashtable.h>	46	# include <ext/stl_hashtable.h>

Return to bug 127026