Package: wy60
Severity: normal
Tags: patch

When building 'wy60' on amd64 with gcc-4.0,
I get the following error:

wy60.c:2824: warning: conflicting types for 'showCursor'
wy60.c:2824: error: static declaration of 'showCursor' follows non-static 
declaration
wy60.c:2222: error: previous implicit declaration of 'showCursor' was here
wy60.c: In function 'executeExternalProgram':
wy60.c:2842: error: invalid storage class for function 'failure'
wy60.c: In function 'requestNewGeometry':
wy60.c:2889: error: invalid storage class for function 'processSignal'
wy60.c: At top level:
wy60.c:3089: warning: conflicting types for 'failure'
wy60.c:3089: error: static declaration of 'failure' follows non-static 
declaration
wy60.c:2352: error: previous implicit declaration of 'failure' was here
wy60.c:3403: warning: conflicting types for 'updateAttributes'
wy60.c:3403: error: static declaration of 'updateAttributes' follows non-static 
declaration
wy60.c:2241: error: previous implicit declaration of 'updateAttributes' was here
wy60.c:4944: warning: conflicting types for 'processSignal'
wy60.c:4944: error: static declaration of 'processSignal' follows non-static 
declaration
wy60.c:2935: error: previous implicit declaration of 'processSignal' was here
make[1]: *** [wy60.o] Error 1
make[1]: Leaving directory `/wy60-2.0.8'
make: *** [build-stamp] Error 2

With the attached patch 'wy60' can be compiled
on amd64 using gcc-4.0.

Regards
Andreas Jochens

diff -urN ../tmp-orig/wy60-2.0.8/wy60.c ./wy60.c
--- ../tmp-orig/wy60-2.0.8/wy60.c       2005-02-09 22:40:43.854026898 +0100
+++ ./wy60.c    2005-02-09 22:40:33.810964171 +0100
@@ -2202,15 +2202,15 @@
 }
 
 
-static void displayCurrentScreenBuffer(void) {
-  static void flushConsole(void);
-  static void gotoXYforce(int x, int y);
-  static void putCapability(const char *capability);
-  static int  putConsole(int ch);
-  static void putGraphics(char ch);
-  static void showCursor(int flag);
-  static void updateAttributes(void);
+static void flushConsole(void);
+static void gotoXYforce(int x, int y);
+static void putCapability(const char *capability);
+static int  putConsole(int ch);
+static void putGraphics(char ch);
+static void showCursor(int flag);
+static void updateAttributes(void);
 
+static void displayCurrentScreenBuffer(void) {
   int x, y, lastAttributes      = -1;
   int oldX                      = currentBuffer->cursorX;
   int oldY                      = currentBuffer->cursorY;
@@ -2345,9 +2345,9 @@
 }
 
 
-static void putCapability(const char *capability) {
-  static void failure(int exitCode, const char *message, ...);
+static void failure(int exitCode, const char *message, ...);
 
+static void putCapability(const char *capability) {
   if (!capability || !strcmp(capability, "@"))
     failure(127, "Terminal has insufficient capabilities");
   logHostString(capability);
@@ -2755,9 +2755,9 @@
 }
 
 
-static void putGraphics(char ch) {
-  static void updateAttributes(void);
+static void updateAttributes(void);
 
+static void putGraphics(char ch) {
   if (ch == '\x02')
     graphicsMode                  = 1;
   else if (ch == '\x03')
@@ -2838,8 +2838,9 @@
 }
 
 
+static void failure(int exitCode, const char *message, ...);
+
 static void executeExternalProgram(const char *argv[]) {
-  static void failure(int exitCode, const char *message, ...);
   int    pid, status;
 
   if ((pid = fork()) < 0) {
@@ -2885,9 +2886,9 @@
 }
 
 
-static void requestNewGeometry(int pty, int width, int height) {
-  static void processSignal(int signalNumber, int pid, int pty);
+static void processSignal(int signalNumber, int pid, int pty);
 
+static void requestNewGeometry(int pty, int width, int height) {
   logDecode("setScreenSize(%d,%d)", width, height);
 
   if (screenWidth != width || screenHeight != height) {


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to