wvstreams/repos/community-x86_64/wvstreams-4.6.1-gcc47.patch

   1 http://bugs.gentoo.org/419563
   2 http://bugs.gentoo.org/419971
   3
   4 See -gcc47-patch and -magic.patch in Fedora git:
   5
   6 http://pkgs.fedoraproject.org/gitweb/?p=libwvstreams.git;a=tree
   7
   8 --- include/wvtask.h
   9 +++ include/wvtask.h
  10 @@ -45,7 +45,8 @@
  11      typedef void TaskFunc(void *userdata);
  12
  13      static int taskcount, numtasks, numrunning;
  14 -    int magic_number, *stack_magic;
  15 +    int volatile magic_number;
  16 +    int *stack_magic;
  17      WvString name;
  18      int tid;
  19
  20 @@ -84,7 +85,7 @@
  21      static WvTaskMan *singleton;
  22      static int links;
  23
  24 -    static int magic_number;
  25 +    static int volatile magic_number;
  26      static WvTaskList all_tasks, free_tasks;
  27
  28      static void get_stack(WvTask &task, size_t size);
  29 --- include/wvuid.h
  30 +++ include/wvuid.h
  31 @@ -7,6 +7,7 @@
  32  #ifndef __WVUID_H
  33  #define __WVUID_H
  34
  35 +#include <unistd.h>
  36  #include "wvstring.h"
  37
  38  #if WIN32
  39 --- utils/wvtask.cc
  40 +++ utils/wvtask.cc
  41 @@ -58,7 +58,8 @@
  42  int WvTask::taskcount, WvTask::numtasks, WvTask::numrunning;
  43
  44  WvTaskMan *WvTaskMan::singleton;
  45 -int WvTaskMan::links, WvTaskMan::magic_number;
  46 +int WvTaskMan::links;
  47 +int volatile WvTaskMan::magic_number;
  48  WvTaskList WvTaskMan::all_tasks, WvTaskMan::free_tasks;
  49  ucontext_t WvTaskMan::stackmaster_task, WvTaskMan::get_stack_return,
  50      WvTaskMan::toplevel;