From 12543d6a5b4afc4cbba20670f3e463672ed9fac4 Mon Sep 17 00:00:00 2001 From: Timothy Collett Date: Thu, 14 Jun 2012 13:42:06 -0400 Subject: [PATCH] Make offsets with "darwin" os-type recognized as Apple, rather than ignored --- depends/clsocket | 2 +- library/VersionInfoFactory.cpp | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/depends/clsocket b/depends/clsocket index c85e9fb35..f2722ca9a 160000 --- a/depends/clsocket +++ b/depends/clsocket @@ -1 +1 @@ -Subproject commit c85e9fb35d3510c5dcc367056cda3237d77a7add +Subproject commit f2722ca9ac49f8f13da4ddcfcb0fa47a0eb30454 diff --git a/library/VersionInfoFactory.cpp b/library/VersionInfoFactory.cpp index 972ab31b4..4ac53dd1a 100644 --- a/library/VersionInfoFactory.cpp +++ b/library/VersionInfoFactory.cpp @@ -105,6 +105,12 @@ void VersionInfoFactory::ParseVersion (TiXmlElement* entry, VersionInfo* mem) // this is wrong... I'm not going to do base image relocation on linux though. mem->setBase(0x0); } + else if(os == "darwin") + { + mem->setOS(OS_APPLE); + // this is wrong... I'm not going to do base image relocation on linux though. + mem->setBase(0x0); + } else { return; // ignore it if it's invalid