diff options
| author | root <root@rshg054.dnsready.net> | 2012-08-15 00:02:45 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-08-15 00:02:45 +0000 |
| commit | c0241f4d9174d80fb50b9561095a685c8a0a5058 (patch) | |
| tree | d514c483a6361485025440e31f135ef36141453a /community/wvstreams/wvstreams-4.6.1-gcc47.patch | |
| parent | a36c4a33891932acf2ac1cdebbb9caed01d7df6f (diff) | |
Wed Aug 15 00:02:44 UTC 2012
Diffstat (limited to 'community/wvstreams/wvstreams-4.6.1-gcc47.patch')
| -rw-r--r-- | community/wvstreams/wvstreams-4.6.1-gcc47.patch | 44 |
1 files changed, 42 insertions, 2 deletions
diff --git a/community/wvstreams/wvstreams-4.6.1-gcc47.patch b/community/wvstreams/wvstreams-4.6.1-gcc47.patch index 3d6704832..b284da8f3 100644 --- a/community/wvstreams/wvstreams-4.6.1-gcc47.patch +++ b/community/wvstreams/wvstreams-4.6.1-gcc47.patch @@ -1,5 +1,33 @@ ---- wvstreams-4.6.1-dist/include/wvuid.h 2012-01-05 10:18:58.713661236 +0100 -+++ wvstreams-4.6.1/include/wvuid.h 2012-01-05 10:27:42.198435328 +0100 +http://bugs.gentoo.org/419563 +http://bugs.gentoo.org/419971 + +See -gcc47-patch and -magic.patch in Fedora git: + +http://pkgs.fedoraproject.org/gitweb/?p=libwvstreams.git;a=tree + +--- include/wvtask.h ++++ include/wvtask.h +@@ -45,7 +45,8 @@ + typedef void TaskFunc(void *userdata); + + static int taskcount, numtasks, numrunning; +- int magic_number, *stack_magic; ++ int volatile magic_number; ++ int *stack_magic; + WvString name; + int tid; + +@@ -84,7 +85,7 @@ + static WvTaskMan *singleton; + static int links; + +- static int magic_number; ++ static int volatile magic_number; + static WvTaskList all_tasks, free_tasks; + + static void get_stack(WvTask &task, size_t size); +--- include/wvuid.h ++++ include/wvuid.h @@ -7,6 +7,7 @@ #ifndef __WVUID_H #define __WVUID_H @@ -8,3 +36,15 @@ #include "wvstring.h" #if WIN32 +--- utils/wvtask.cc ++++ utils/wvtask.cc +@@ -58,7 +58,8 @@ + int WvTask::taskcount, WvTask::numtasks, WvTask::numrunning; + + WvTaskMan *WvTaskMan::singleton; +-int WvTaskMan::links, WvTaskMan::magic_number; ++int WvTaskMan::links; ++int volatile WvTaskMan::magic_number; + WvTaskList WvTaskMan::all_tasks, WvTaskMan::free_tasks; + ucontext_t WvTaskMan::stackmaster_task, WvTaskMan::get_stack_return, + WvTaskMan::toplevel; |