Package: atari800
Severity: normal
Tags: patch
When building 'atari800' on ppc64 with gcc-4.0,
I get the following error:
gcc -c -o sndsave.o -DHAVE_CONFIG_H -I. -g -Wall -O3 -g -Wall -O3 sndsave.c
sndsave.c:33: error: static declaration of 'sndoutput' follows non-static
declaration
sndsave.h:7: error: previous declaration of 'sndoutput' was here
make[2]: *** [sndsave.o] Error 1
make[2]: Leaving directory `/atari800-1.3.2/src'
With the attached patch 'atari800' can be compiled
on ppc64 using gcc-4.0.
Regards
Andreas Jochens
diff -urN ../tmp-orig/atari800-1.3.2/src/sndsave.h ./src/sndsave.h
--- ../tmp-orig/atari800-1.3.2/src/sndsave.h 2000-11-14 13:13:33.000000000
+0000
+++ ./src/sndsave.h 2005-01-11 09:38:38.000000000 +0000
@@ -4,7 +4,6 @@
#include "atari.h"
#include <stdio.h>
-extern FILE *sndoutput;
extern int iSoundRate;
typedef int BOOL;
diff -urN ../tmp-orig/atari800-1.3.2/src/atari_x11.c ./src/atari_x11.c
--- ../tmp-orig/atari800-1.3.2/src/atari_x11.c 2003-02-24 09:32:44.000000000
+0000
+++ ./src/atari_x11.c 2005-01-11 10:03:21.000000000 +0000
@@ -215,7 +215,7 @@
static int keypad_trig = 1; /* Keypad Trigger Position */
static int keypad_stick = 0x0f; /* Keypad Joystick Position */
-static int mouse_mode = -1; /* Joystick, Paddle and Light Pen */
+static int mouse_mode_local = -1; /* Joystick, Paddle and Light Pen */
static int mouse_stick; /* Mouse Joystick Position */
static int js0_mode = -1;
@@ -1174,7 +1174,7 @@
new_mode = xv_get(keypad_item, PANEL_VALUE);
- if ((new_mode != mouse_mode) &&
+ if ((new_mode != mouse_mode_local) &&
(new_mode != js0_mode) &&
(new_mode != js1_mode)) {
keypad_mode = new_mode;
@@ -1196,12 +1196,12 @@
if ((new_mode != keypad_mode) &&
(new_mode != js0_mode) &&
(new_mode != js1_mode)) {
- mouse_mode = new_mode;
+ mouse_mode_local = new_mode;
}
else {
sorry_message();
xv_set(mouse_item,
- PANEL_VALUE, mouse_mode,
+ PANEL_VALUE, mouse_mode_local,
NULL);
}
}
@@ -1214,7 +1214,7 @@
new_mode = xv_get(js0_item, PANEL_VALUE);
if ((new_mode != keypad_mode) &&
- (new_mode != mouse_mode) &&
+ (new_mode != mouse_mode_local) &&
(new_mode != js1_mode)) {
js0_mode = new_mode;
}
@@ -1233,7 +1233,7 @@
new_mode = xv_get(js1_item, PANEL_VALUE);
if ((new_mode != keypad_mode) &&
- (new_mode != mouse_mode) &&
+ (new_mode != mouse_mode_local) &&
(new_mode != js0_mode)) {
js1_mode = new_mode;
}
@@ -1692,7 +1692,7 @@
}
#endif
- mouse_mode = mode++;
+ mouse_mode_local = mode++;
if (keypad_mode == -1)
keypad_mode = mode++;
@@ -1879,7 +1879,7 @@
"Paddle 8",
"Light Pen",
NULL,
-
PANEL_VALUE, mouse_mode,
+
PANEL_VALUE, mouse_mode_local,
PANEL_NOTIFY_PROC, mouse_callback,
NULL);
ypos += 25;
@@ -2531,7 +2531,7 @@
Atari_WhatIs(keypad_mode);
printf("\n");
printf("Mouse is ");
- Atari_WhatIs(mouse_mode);
+ Atari_WhatIs(mouse_mode_local);
printf("\n");
printf("/dev/js0 is ");
Atari_WhatIs(js0_mode);
@@ -3415,12 +3415,12 @@
else if (keypad_mode == 1)
nibble_1 = keypad_stick;
- if (mouse_mode == 0) {
- mouse_joystick(mouse_mode);
+ if (mouse_mode_local == 0) {
+ mouse_joystick(mouse_mode_local);
nibble_0 = mouse_stick;
}
- else if (mouse_mode == 1) {
- mouse_joystick(mouse_mode);
+ else if (mouse_mode_local == 1) {
+ mouse_joystick(mouse_mode_local);
nibble_1 = mouse_stick;
}
#ifdef LINUX_JOYSTICK
@@ -3448,12 +3448,12 @@
else if (keypad_mode == 3)
nibble_1 = keypad_stick;
- if (mouse_mode == 2) {
- mouse_joystick(mouse_mode);
+ if (mouse_mode_local == 2) {
+ mouse_joystick(mouse_mode_local);
nibble_0 = mouse_stick;
}
- else if (mouse_mode == 3) {
- mouse_joystick(mouse_mode);
+ else if (mouse_mode_local == 3) {
+ mouse_joystick(mouse_mode_local);
nibble_1 = mouse_stick;
}
#ifdef LINUX_JOYSTICK
@@ -3486,7 +3486,7 @@
if (num == keypad_mode) {
trig = keypad_trig;
}
- if (num == mouse_mode) {
+ if (num == mouse_mode_local) {
Window root_return;
Window child_return;
int root_x_return;
@@ -3558,7 +3558,7 @@
{
int pot;
- if (num == (mouse_mode - 4)) {
+ if (num == (mouse_mode_local - 4)) {
Window root_return;
Window child_return;
int root_x_return;
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
