Attachment #324 for issue #1129

View | Details | Raw Unified | Return to issue 1129
Collapse All | Expand All

Lines 125-130 Link Here

(-)cppu/inc/cppu/macros.hxx (+4 lines)
125	# define CPPU_CLBN_TMP UNO_LB_GCC2	125	# define CPPU_CLBN_TMP UNO_LB_GCC2
126	# define CPPU_CLBN_NS_TMP UNO_LB_GCC2_NAMESPACE	126	# define CPPU_CLBN_NS_TMP UNO_LB_GCC2_NAMESPACE
127	# define CPPU_DLL_POSTFIX "GCC"	127	# define CPPU_DLL_POSTFIX "GCC"
		128	# elif ( __GNUC__ == 3 )
		129	# define CPPU_CLBN_TMP UNO_LB_GCC2
		130	# define CPPU_CLBN_NS_TMP UNO_LB_GCC2_NAMESPACE
		131	# define CPPU_DLL_POSTFIX "GCC"
128	# else	132	# else
129	# error "unknown gcc version"	133	# error "unknown gcc version"
130	# endif	134	# endif

Lines 59-65 Link Here

(-)cppu/source/threadpool/current.cxx (+4 lines)
59	*	59	*
60	************************************************************************/	60	************************************************************************/
61		61
		62	#if ( __GNUC__ == 3)
		63	#include <ext/hash_map>
		64	#else
62	#include <hash_map>	65	#include <hash_map>
		66	#endif
63		67
64	#include <rtl/uuid.h>	68	#include <rtl/uuid.h>
65	#include <osl/thread.h>	69	#include <osl/thread.h>

Lines 62-68 Link Here

(-)cppu/source/threadpool/threadident.cxx (+4 lines)
62	#include <assert.h>	62	#include <assert.h>
63		63
64	#include <list>	64	#include <list>
		65	#if ( __GNUC__ == 3 )
		66	#include <ext/hash_map>
		67	#else
65	#include <hash_map>	68	#include <hash_map>
		69	#endif
66		70
67	#include <osl/mutex.hxx>	71	#include <osl/mutex.hxx>
68	#include <osl/thread.h>	72	#include <osl/thread.h>

Lines 58-64 Link Here

(-)cppu/source/threadpool/threadpool.cxx (+4 lines)
58	*	58	*
59	*	59	*
60	************************************************************************/	60	************************************************************************/
		61	#if ( __GNUC__ == 3 )
		62	#include <ext/hash_set>
		63	#else
61	#include <hash_set>	64	#include <hash_set>
		65	#endif
62	#include <stdio.h>	66	#include <stdio.h>
63		67
64	#include <osl/diagnose.h>	68	#include <osl/diagnose.h>

Lines 58-64 Link Here

(-)cppu/source/threadpool/threadpool.hxx (+4 lines)
58	*	58	*
59	*	59	*
60	************************************************************************/	60	************************************************************************/
		61	#if ( __GNUC__ == 3 )
		62	#include <ext/hash_map>
		63	#else
61	#include <hash_map>	64	#include <hash_map>
		65	#endif
62		66
63	#include <osl/conditn.h>	67	#include <osl/conditn.h>
64		68

Lines 65-71 Link Here

(-)cppu/source/typelib/typelib.cxx (-1 / +5 lines)
65	#define CPPU_TRACE	65	#define CPPU_TRACE
66	#endif	66	#endif
67		67
		68	#if ( __GNUC__ == 3 )
		69	#include <ext/hash_map>
		70	#else
68	#include <hash_map>	71	#include <hash_map>
		72	#endif
69	#include <list>	73	#include <list>
70		74
71	#include <stdarg.h>	75	#include <stdarg.h>
Lines 79-85 Link Here
79	#else	83	#else
80	#include <malloc.h>	84	#include <malloc.h>
81	#endif	85	#endif
82	#ifdef SOLARIS	86	#if defined (SOLARIS) \|\| defined (IRIX)
83	#include <alloca.h>	87	#include <alloca.h>
84	#endif	88	#endif
85	#include <new.h>	89	#include <new.h>




#endif

#include <stdio.h>
#if defined (SOLARIS) || defined (IRIX)
#include <alloca.h>
#elif defined MACOSX
#include <sys/malloc.h>
#else
#include <malloc.h>
#endif
#if ( __GNUC__ == 3 )
#include <ext/hash_map>
#else
#include <hash_map>
#endif
#include <vector>

#ifndef _TYPELIB_TYPEDESCRIPTION_H_

Lines 100-106 Link Here

(-)cppu/source/uno/lbmap.cxx (+4 lines)
100		100
101	#include <com/sun/star/uno/XInterface.hpp>	101	#include <com/sun/star/uno/XInterface.hpp>
102		102
		103	#if ( __GNUC__ == 3 )
		104	#include <ext/hash_map>
		105	#else
103	#include <hash_map>	106	#include <hash_map>
		107	#endif
104	#include <set>	108	#include <set>
105	#include <algorithm>	109	#include <algorithm>
106		110

Lines 87-93 Link Here

(-)cppu/util/makefile.mk (-1 / +1 lines)
87	SHL1IMPLIB= i$(TARGET)	87	SHL1IMPLIB= i$(TARGET)
88	SHL1DEF= $(MISC)$/$(SHL1TARGET).def	88	SHL1DEF= $(MISC)$/$(SHL1TARGET).def
89		89
90	SHL1VERSIONMAP= $(TARGET).map	90	#SHL1VERSIONMAP= $(TARGET).map
91		91
92	DEF1NAME= $(SHL1TARGET)	92	DEF1NAME= $(SHL1TARGET)
93	#DEF1EXPORTFILE= exports.dxp	93	#DEF1EXPORTFILE= exports.dxp

Return to issue 1129

Lines 88-101 Link Here

(-)cppu/source/uno/lbenv.cxx (-1 / +5 lines)
88	#endif	88	#endif
89		89
90	#include <stdio.h>	90	#include <stdio.h>
91	#ifdef SOLARIS	91	#if defined (SOLARIS) \|\| defined (IRIX)
92	#include <alloca.h>	92	#include <alloca.h>
93	#elif defined MACOSX	93	#elif defined MACOSX
94	#include <sys/malloc.h>	94	#include <sys/malloc.h>
95	#else	95	#else
96	#include <malloc.h>	96	#include <malloc.h>
97	#endif	97	#endif
		98	#if ( __GNUC__ == 3 )
		99	#include <ext/hash_map>
		100	#else
98	#include <hash_map>	101	#include <hash_map>
		102	#endif
99	#include <vector>	103	#include <vector>
100		104
101	#ifndef _TYPELIB_TYPEDESCRIPTION_H_	105	#ifndef _TYPELIB_TYPEDESCRIPTION_H_