rooty/HLMetaModOfficial
1
0
Fork 0
mirror of https://github.com/alliedmodders/metamod-source.git synced 2025-03-21 12:28:56 +01:00
Code Issues Releases Activity

Revert "Branch fixes."

Browse Source 
This reverts commit ed081f045e486c90594068a0869de16952534960.
This commit is contained in:
Nicholas Hastings 2014-09-11 19:15:41 -04:00
parent 27cec07977
commit 5667763019
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/metamod_oslink.cpp
View File

@ -94,11 +94,7 @@ bool GetFileOfAddress(void *pAddr, char *buffer, size_t maxlength)
return true;
}
#if defined __linux__ || defined __APPLE__
extern "C" void __cxa_pure_virtual(void)
{
}
#if defined __GNUC__ && (__GNUC__ == 3 || __GNUC__ == 4)
void * operator new(size_t size) {
return malloc(size);
}

2
support/buildbot/generate_headers.py
View File

@ -50,7 +50,7 @@ def output_version_header():
count, shorthash, longhash = get_git_version()
with open(os.path.join(SourceFolder, 'product.version')) as fp:
contents = fp.read().strip()
contents = fp.read()
m = re.match('(\d+)\.(\d+)\.(\d+)-?(.*)', contents)
if m == None:
raise Exception('Could not detremine product version')