rpms/poker-eval/devel poker-eval-135.0-gcc44.patch, NONE, 1.1 poker-eval.spec, 1.19, 1.20

[Ralf Corsépius]

Author: corsepiu

Update of /cvs/pkgs/rpms/poker-eval/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3572

Modified Files:
	poker-eval.spec 
Added Files:
	poker-eval-135.0-gcc44.patch 
Log Message:
* Sun Feb 15 2009 Ralf Corsepius <corsepiu at fedoraproject.org> 135.0-2
- Add poker-eval-135.0-gcc44.patch to work around BZ485619 killing
  building poker3d (BZ 485633).


poker-eval-135.0-gcc44.patch:

--- NEW FILE poker-eval-135.0-gcc44.patch ---
--- lib/deck.c~	2009-02-15 18:12:31.000000000 +0100
+++ lib/deck.c	2009-02-15 18:12:31.000000000 +0100
@@ -21,6 +21,11 @@
 #include <stdio.h>
 #include "poker_defs.h"
 
+#if defined(_MSC_VER)
+#define THREAD_DECL __declspec( thread )
+#else
+#define THREAD_DECL
+#endif
 
 int
 GenericDeck_maskToString(Deck *deck, void *cardMask, char *outString) {
@@ -53,7 +58,7 @@
 
 char *
 GenericDeck_maskString(Deck *deck, void *cardMask) {
-  static thread char outString[150];
+  static THREAD_DECL char outString[150];
 
   GenericDeck_maskToString(deck, cardMask, outString);
   return outString;
@@ -68,7 +73,7 @@
 
 char *
 GenericDeck_cardString(Deck *deck, int cardIndex) {
-  static thread char outString[16];
+  static THREAD_DECL char outString[16];
 
   (*deck->cardToString)(cardIndex, outString);
   return outString;
--- include/poker_defs.h~	2009-02-15 18:12:52.000000000 +0100
+++ include/poker_defs.h	2009-02-15 18:12:52.000000000 +0100
@@ -27,9 +27,7 @@
 #if defined(_MSC_VER)
 #  define UINT64_TYPE unsigned __int64
 #  define inline __inline
-#  define thread __declspec( thread )
 #else
-#  define thread 
 #  include "poker_config.h"
 #endif
 


Index: poker-eval.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poker-eval/devel/poker-eval.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- poker-eval.spec	2 Jan 2009 01:31:21 -0000	1.19
+++ poker-eval.spec	15 Feb 2009 17:57:52 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           poker-eval
 Version:        135.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Poker hand evaluator library
 
 Group:          Development/Libraries
@@ -9,9 +9,10 @@
 Source0:        http://download.gna.org/pokersource/sources/%{name}-%{version}.tar.gz
 Patch0:         %{name}-134.0-multiarch.patch
 Patch1:         %{name}-135.0-exit.patch
+# Workaround to BZ 485619, trigger when building poker3d
+Patch2:         %{name}-135.0-gcc44.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-
 %description
 This package is a free (GPL) toolkit for writing programs which
 simulate or analyze poker games.
@@ -32,6 +33,7 @@
 %setup -q
 %patch0 -p0 -b .multiarch~
 %patch1 -p0 -b .exit~
+%patch2 -p0 -b .gcc44~
 
 # use examples/ directory for devel package %doc section
 mkdir -p tmp/examples && cp examples/*.c tmp/examples
@@ -78,6 +80,10 @@
 
 
 %changelog
+* Sun Feb 15 2009 Ralf Corsepius <corsepiu at fedoraproject.org> 135.0-2
+- Add poker-eval-135.0-gcc44.patch to work around BZ485619 killing
+  building poker3d (BZ 485633).
+
 * Thu Jan 01 2009 Christopher Stone <chris.stone at gmail.com> 135.0-1
 - Upstream sync
 - Add patch to remove exit calls from library