From ed081f045e486c90594068a0869de16952534960 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 10 Sep 2014 22:26:34 -0700 Subject: [PATCH] Branch fixes. --- core/metamod_oslink.cpp | 6 +++++- support/buildbot/generate_headers.py | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/core/metamod_oslink.cpp b/core/metamod_oslink.cpp index 2ec065d4..00cd6e6d 100644 --- a/core/metamod_oslink.cpp +++ b/core/metamod_oslink.cpp @@ -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); } diff --git a/support/buildbot/generate_headers.py b/support/buildbot/generate_headers.py index 0135d2c1..1e755afc 100644 --- a/support/buildbot/generate_headers.py +++ b/support/buildbot/generate_headers.py @@ -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')