updated on Thu Jan 26 16:09:46 UTC 2012
[aur-mirror.git] / stepmania-beta / warnings-4.patch
blob6931a0bf76cda973306727198ee52550b2593391
1 diff -au StepMania-3.9-src-orig/src/archutils/Unix/CrashHandler.cpp StepMania-3.9-src/src/archutils/Unix/CrashHandler.cpp
2 --- StepMania-3.9-src-orig/src/archutils/Unix/CrashHandler.cpp 2005-10-17 03:39:27.000000000 +0200
3 +++ StepMania-3.9-src/src/archutils/Unix/CrashHandler.cpp 2007-11-15 15:45:05.000000000 +0100
4 @@ -102,9 +102,9 @@
5 GetExecutableName( path, sizeof(path) );
7 /* Use execve; it's the lowest-level of the exec calls. The others may allocate. */
8 - char *argv[3] = { path, CHILD_MAGIC_PARAMETER, NULL };
9 + const char *argv[3] = { path, CHILD_MAGIC_PARAMETER, NULL };
10 char *envp[1] = { NULL };
11 - execve( path, argv, envp );
12 + execve( path, (char* const*)argv, envp );
14 /* If we got here, the exec failed. We can't call strerror. */
15 // safe_print(fileno(stderr), "Crash handler execl(", path, ") failed: ", strerror(errno), "\n", NULL);
16 diff -au StepMania-3.9-src-orig/src/arch/LoadingWindow/LoadingWindow_GtkModule.cpp StepMania-3.9-src/src/arch/LoadingWindow/LoadingWindow_GtkModule.cpp
17 --- StepMania-3.9-src-orig/src/arch/LoadingWindow/LoadingWindow_GtkModule.cpp 2004-09-14 02:40:10.000000000 +0200
18 +++ StepMania-3.9-src/src/arch/LoadingWindow/LoadingWindow_GtkModule.cpp 2007-11-15 15:03:24.000000000 +0100
19 @@ -20,7 +20,7 @@
20 window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
21 gtk_window_set_position( GTK_WINDOW(window), GTK_WIN_POS_CENTER );
22 gtk_widget_realize(window);
23 - loadmap = gdk_pixmap_create_from_xpm_d(window->window,NULL,NULL,loading);
24 + loadmap = gdk_pixmap_create_from_xpm_d(window->window,NULL,NULL,(gchar **)loading);
25 loadimage = gtk_image_new_from_pixmap(loadmap,NULL);
26 label = gtk_label_new(NULL);
27 gtk_label_set_justify(GTK_LABEL(label),GTK_JUSTIFY_CENTER);
28 diff -au StepMania-3.9-src-orig/src/arch/LoadingWindow/loading.xpm StepMania-3.9-src/src/arch/LoadingWindow/loading.xpm
29 --- StepMania-3.9-src-orig/src/arch/LoadingWindow/loading.xpm 2002-11-18 22:37:58.000000000 +0100
30 +++ StepMania-3.9-src/src/arch/LoadingWindow/loading.xpm 2007-11-15 15:00:11.000000000 +0100
31 @@ -1,5 +1,5 @@
32 /* XPM */
33 -static char *loading[] = {
34 +static const char *loading[] = {
35 /* width height ncolors chars_per_pixel */
36 "468 62 128 2",
37 /* colors */
38 Index: src/crypto51/integer.cpp
39 ===================================================================
40 --- a/src/crypto51/integer.cpp (revision 28522)
41 +++ b/src/crypto51/integer.cpp (working copy)
42 @@ -54,7 +54,7 @@
43 template class AlignedAllocator<word>;
44 #endif
46 -#define MAKE_DWORD(lowWord, highWord) ((dword(highWord)<<WORD_BITS) | (lowWord))
47 +#define MAKE_DWORD(lowWord, highWord) (((dword)highWord<<WORD_BITS) | (lowWord))
49 static int Compare(const word *A, const word *B, unsigned int N)
51 Index: src/GameManager.cpp
52 ===================================================================
53 --- a/src/GameManager.cpp (revision 28522)
54 +++ b/src/GameManager.cpp (working copy)
55 @@ -66,7 +66,7 @@
56 const int POPN9_COL_SPACING = 32;
58 static struct {
59 - char *name;
60 + const char *name;
61 int NumTracks;
62 } const StepsTypes[NUM_STEPS_TYPES] = {
63 { "dance-single", 4 },