Permalink
Browse files

Branch fixes.

  • Loading branch information...
dvander committed Sep 11, 2014
1 parent 80d49a6 commit e7d277e45b4926a161e3fc8d85c1519682034f10
Showing with 6 additions and 2 deletions.
  1. +5 −1 core/metamod_oslink.cpp
  2. +1 −1 support/buildbot/generate_headers.py
View
@@ -94,7 +94,11 @@ bool GetFileOfAddress(void *pAddr, char *buffer, size_t maxlength)
return true;
}
#if defined __GNUC__ && (__GNUC__ == 3 || __GNUC__ == 4)
#if defined __linux__ || defined __APPLE__
extern "C" void __cxa_pure_virtual(void)
{
}
void * operator new(size_t size) {
return malloc(size);
}
@@ -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()
contents = fp.read().strip()
m = re.match('(\d+)\.(\d+)\.(\d+)-?(.*)', contents)
if m == None:
raise Exception('Could not detremine product version')

0 comments on commit e7d277e

Please sign in to comment.