|
Line
Link Here
|
| 0 |
-- STLport-5.1.5.orig/build/Makefiles/gmake/gcc.mak |
0 |
++ STLport-5.1.5/build/Makefiles/gmake/gcc.mak |
|
Lines 29-34
Link Here
|
| 29 |
CXX_VERSION := $(shell ${CXX} --version | grep GCC | awk '{ print $$3; }') |
29 |
CXX_VERSION := $(shell ${CXX} --version | grep GCC | awk '{ print $$3; }') |
| 30 |
|
30 |
|
| 31 |
ifeq ($(CXX_VERSION),) |
31 |
ifeq ($(CXX_VERSION),) |
|
|
32 |
# Current g++-4.3 |
| 33 |
CXX_VERSION := $(shell ${CXX} --version | grep '^g++' | awk '{ print $$4; }') |
| 34 |
endif |
| 35 |
|
| 36 |
ifeq ($(CXX_VERSION),) |
| 32 |
# 2.95 report only version |
37 |
# 2.95 report only version |
| 33 |
CXX_VERSION := $(shell ${CXX} --version) |
38 |
CXX_VERSION := $(shell ${CXX} --version) |
| 34 |
endif |
39 |
endif |
| 35 |
-- STLport-5.1.5.orig/stlport/limits.h |
40 |
++ STLport-5.1.5/stlport/limits.h |
|
Lines 24-30
Link Here
|
| 24 |
struct _exception; |
24 |
struct _exception; |
| 25 |
#endif |
25 |
#endif |
| 26 |
|
26 |
|
| 27 |
#include _STLP_NATIVE_C_HEADER(limits.h) |
27 |
#if defined (_STLP_HAS_INCLUDE_NEXT) |
|
|
28 |
# include_next <limits.h> |
| 29 |
#else |
| 30 |
# include _STLP_NATIVE_C_HEADER(limits.h) |
| 31 |
#endif |
| 28 |
|
32 |
|
| 29 |
#if (_STLP_OUTERMOST_HEADER_ID == 0x201) |
33 |
#if (_STLP_OUTERMOST_HEADER_ID == 0x201) |
| 30 |
# if ! defined (_STLP_DONT_POP_HEADER_ID) |
34 |
# if ! defined (_STLP_DONT_POP_HEADER_ID) |
| 31 |
-- STLport-5.1.5.orig/stlport/stl/config/_gcc.h |
35 |
++ STLport-5.1.5/stlport/stl/config/_gcc.h |
|
Lines 4-9
Link Here
|
| 4 |
|
4 |
|
| 5 |
#define _STLP_COMPILER "gcc" |
5 |
#define _STLP_COMPILER "gcc" |
| 6 |
|
6 |
|
|
|
7 |
#define _STLP_HAS_INCLUDE_NEXT 1 |
| 8 |
|
| 7 |
/* Systems having GLIBC installed have different traits */ |
9 |
/* Systems having GLIBC installed have different traits */ |
| 8 |
#if defined (__linux__) |
10 |
#if defined (__linux__) |
| 9 |
# ifndef _STLP_USE_GLIBC |
11 |
# ifndef _STLP_USE_GLIBC |
