Permalink
Browse files

GCC 5.X: Force disable macro _GLIBCXX_USE_CXX11_ABI for compatibility…

… oldest version libstdc++

Fix #476
  • Loading branch information...
s1lentq committed Jun 28, 2017
1 parent ba2d9e2 commit eac20aef3abf65509903f87e05e0eea7428d6a03
Showing with 12 additions and 5 deletions.
  1. +2 −3 rehlds/HLTV/Proxy/src/Proxy.cpp
  2. +10 −2 shared_icc.gradle
@@ -1301,11 +1301,10 @@ unsigned int Proxy::GetChallengeNumber(NetAddress *host)
int i;
int oldest = 0;
float oldestTime = 9.9999997e37f;
const float challengeLife = 40.0f;

for (i = 0; i < MAX_CHALLENGES; i++)
{
if (m_Challenges[i].adr.Equal(host)) {
if (m_Challenges[i].adr.EqualBase(host)) {
break;
}

@@ -1343,7 +1342,7 @@ bool Proxy::CheckChallenge(NetAddress *from, unsigned int challengeNumber)
{
if (from->EqualBase(&it.adr)) {
if (it.challenge == challengeNumber) {
return (m_SystemTime - it.time <= 40);
return (m_SystemTime - it.time <= PROXY_CHALLENGE_LIFE);
}

break;
@@ -16,7 +16,11 @@ rootProject.ext.createIccConfig = { boolean release, BinaryKind binKind ->
intelExtensions: false,
asmBlocks: true,

positionIndependentCode: false
positionIndependentCode: false,

extraDefines: [
'_GLIBCXX_USE_CXX11_ABI': 0,
]
),

linkerOptions: new GccToolchainConfig.LinkerOptions(
@@ -41,7 +45,11 @@ rootProject.ext.createIccConfig = { boolean release, BinaryKind binKind ->

noBuiltIn: true,
intelExtensions: false,
asmBlocks: true
asmBlocks: true,

extraDefines: [
'_GLIBCXX_USE_CXX11_ABI': 0,
]
),

linkerOptions: new GccToolchainConfig.LinkerOptions(

0 comments on commit eac20ae

Please sign in to comment.