Gentoo Archives: gentoo-commits

From: "Christoph Mende (angelos)" <angelos@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in games-puzzle/magiccube4d/files: magiccube4d-2.2-64bit-ptr.patch
Date: Mon, 22 Oct 2007 20:30:12
Message-Id: E1Ik3uZ-0006jM-54@stork.gentoo.org
1 angelos 07/10/22 20:30:07
2
3 Added: magiccube4d-2.2-64bit-ptr.patch
4 Log:
5 Fixed compilation on amd64 and ~amd64 added
6 (Portage version: 2.1.3.15)
7
8 Revision Changes Path
9 1.1 games-puzzle/magiccube4d/files/magiccube4d-2.2-64bit-ptr.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-puzzle/magiccube4d/files/magiccube4d-2.2-64bit-ptr.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-puzzle/magiccube4d/files/magiccube4d-2.2-64bit-ptr.patch?rev=1.1&content-type=text/plain
13
14 Index: magiccube4d-2.2-64bit-ptr.patch
15 ===================================================================
16 diff -Nru magiccube4d-src-2_2.orig/EventHandler.cpp magiccube4d-src-2_2/EventHandler.cpp
17 --- magiccube4d-src-2_2.orig/EventHandler.cpp 2007-09-30 12:01:46.503967712 +0200
18 +++ magiccube4d-src-2_2/EventHandler.cpp 2007-09-30 12:03:23.489172011 +0200
19 @@ -20,6 +20,7 @@
20 #include <iostream>
21 #include <unistd.h>
22 #include <stdio.h>
23 +#include <stdint.h>
24
25 #include "MagicCube.h"
26 #include "Puzzlest.h"
27 @@ -415,7 +416,7 @@
28 void
29 EventHandler::undo_cb(void* argp)
30 {
31 - int arg = (int) argp;
32 + int arg = (intptr_t) argp;
33 struct stickerspec grip;
34 int dir;
35 int slicesmask;
36 @@ -461,7 +462,7 @@
37 void
38 EventHandler::redo_cb(void* argp)
39 {
40 - int arg = (int) argp;
41 + int arg = (intptr_t) argp;
42 struct stickerspec grip;
43 int dir;
44 int slicesmask;
45 @@ -507,7 +508,7 @@
46 void
47 EventHandler::scramble_cb(void *arg = NULL)
48 {
49 - int n = (int)arg;
50 + int n = (intptr_t)arg;
51 struct stickerspec grip;
52 int i, previous_face = -1;
53 int ngrips = NFACES * 3 * 3 * 3;
54 @@ -855,12 +856,12 @@
55 void
56 EventHandler::newPuzzle_cb(void* arg)
57 {
58 - if ((int)arg == preferences.getLength())
59 + if ((intptr_t)arg == preferences.getLength())
60 {
61 reset_cb(0);
62 return;
63 }
64 - preferences.setLength((int)arg);
65 + preferences.setLength((intptr_t)arg);
66 int length = preferences.getLength();
67
68 polymgr->reset(length);
69
70
71
72 --
73 gentoo-commits@g.o mailing list