Permalink
Browse files

Revert "Branch fixes."

This reverts commit e7d277e.
  • Loading branch information...
psychonic committed Sep 11, 2014
1 parent b5b0114 commit b5a6377c6c9e6445ebcaede0c093e11303dd09cf
Showing with 2 additions and 6 deletions.
  1. +1 −5 core/metamod_oslink.cpp
  2. +1 −1 support/buildbot/generate_headers.py
View
@@ -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);
}
@@ -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')

0 comments on commit b5a6377

Please sign in to comment.