diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2009-01-09 19:46:25 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2009-01-09 19:46:25 +0800 |
| commit | 4e3f78282f9512b829af2d616ab0dcea8a59219d (patch) | |
| tree | 676f07250c281d79a681bde0b5f691190efcf999 /databases/glom/files | |
| parent | 2a8ef16e1ded69d3a9af8c226e408048be994e94 (diff) | |
| download | marcuscom-ports-4e3f78282f9512b829af2d616ab0dcea8a59219d.tar marcuscom-ports-4e3f78282f9512b829af2d616ab0dcea8a59219d.tar.gz marcuscom-ports-4e3f78282f9512b829af2d616ab0dcea8a59219d.tar.bz2 marcuscom-ports-4e3f78282f9512b829af2d616ab0dcea8a59219d.tar.lz marcuscom-ports-4e3f78282f9512b829af2d616ab0dcea8a59219d.tar.xz marcuscom-ports-4e3f78282f9512b829af2d616ab0dcea8a59219d.tar.zst marcuscom-ports-4e3f78282f9512b829af2d616ab0dcea8a59219d.zip | |
Update to 1.8.5.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@11858 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'databases/glom/files')
| -rw-r--r-- | databases/glom/files/patch-glom_main.cc | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/databases/glom/files/patch-glom_main.cc b/databases/glom/files/patch-glom_main.cc index 6d40eb0ef..69a77fb59 100644 --- a/databases/glom/files/patch-glom_main.cc +++ b/databases/glom/files/patch-glom_main.cc @@ -1,19 +1,32 @@ ---- glom/main.cc.orig 2008-08-08 02:55:08.000000000 +0200 -+++ glom/main.cc 2008-08-08 02:55:59.000000000 +0200 -@@ -84,14 +84,14 @@ OptionGroup::OptionGroup() +--- glom/main.cc.orig 2008-08-22 16:36:46.000000000 +0200 ++++ glom/main.cc 2008-09-13 21:23:46.000000000 +0200 +@@ -89,18 +89,19 @@ } //namespace Glom --extern "C" void __libc_freeres(void); -+//extern "C" void __libc_freeres(void); +-#ifndef G_OS_WIN32 ++#ifdef __linux + extern "C" void __libc_freeres(void); + #endif int main(int argc, char* argv[]) { +-#ifndef G_OS_WIN32 ++#ifdef __linux //Force some cleanup at exit, //to help valgrind to detect memory leaks: -- atexit(__libc_freeres); -+ //atexit(__libc_freeres); + atexit(__libc_freeres); + #else ++# ifdef G_OS_WIN32 + WSADATA data; + int errcode = WSAStartup(MAKEWORD(2, 0), &data); + if(errcode != 0) +@@ -108,6 +109,7 @@ + std::cerr << "Failed to initialize WinSock: " << errcode << std::endl; + return -1; + } ++# endif + #endif // TODO: I am not sure why, but this does not work. PYTHONPATH is set - // correctly according to getenv(), but python still does not look in it. |