cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

proactively fix building with gcc4; problem reported on FreeBSD

Browse Source
This commit is contained in:
naddy 2006-12-14 21:19:19 +00:00
parent 8123e82273
commit ae971b6ac1
1 changed files with 96 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
comms/wy60/patches/patch-wy60_c Normal file
View File

@ -0,0 +1,96 @@
$OpenBSD: patch-wy60_c,v 1.1 2006/12/14 21:19:19 naddy Exp $
--- wy60.c.orig Thu Dec 14 21:06:17 2006
+++ wy60.c Thu Dec 14 21:36:54 2006
@@ -59,6 +59,17 @@ typedef struct ScreenBuffer {
} ScreenBuffer;
+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 failure(int exitCode, const char *message, ...);
+static void processSignal(int signalNumber, int pid, int pty);
+
+
static int euid, egid, uid, gid, oldStylePty, streamsIO, jobControl;
static char ptyName[40];
static struct termios defaultTermios;
@@ -260,7 +271,6 @@ static void logCharacters(int mode, cons
logFd = -1;
}
if (logFd >= 0) {
- static void flushConsole(void);
int header[4];
gettimeofday(&timeValue, 0);
@@ -295,7 +305,6 @@ static void logHostCharacter(int mode, c
}
if (logFd >= 0) {
- static void flushConsole(void);
char buffer[80];
if (isatty(logFd))
@@ -369,8 +378,6 @@ static void logDecode(const char *format
static void logDecodeFlush(void) {
if (_decodeFd >= 0) {
- static void flushConsole(void);
-
if (isatty(_decodeFd))
strcat(_decodeBuffer, "\x1B[39m");
strcat(_decodeBuffer, "\r\n");
@@ -2203,14 +2210,6 @@ static ScreenBuffer *adjustScreenBuffer(
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);
-
int x, y, lastAttributes = -1;
int oldX = currentBuffer->cursorX;
int oldY = currentBuffer->cursorY;
@@ -2346,8 +2345,6 @@ static int putConsole(int ch) {
static void putCapability(const char *capability) {
- static void failure(int exitCode, const char *message, ...);
-
if (!capability || !strcmp(capability, "@"))
failure(127, "Terminal has insufficient capabilities");
logHostString(capability);
@@ -2756,8 +2753,6 @@ static void setPage(int page) {
static void putGraphics(char ch) {
- static void updateAttributes(void);
-
if (ch == '\x02')
graphicsMode = 1;
else if (ch == '\x03')
@@ -2839,7 +2834,6 @@ static void showCursor(int flag) {
static void executeExternalProgram(const char *argv[]) {
- static void failure(int exitCode, const char *message, ...);
int pid, status;
if ((pid = fork()) < 0) {
@@ -2886,8 +2880,6 @@ static void executeExternalProgram(const
static void requestNewGeometry(int pty, int width, int height) {
- static void processSignal(int signalNumber, int pid, int pty);
-
logDecode("setScreenSize(%d,%d)", width, height);
if (screenWidth != width || screenHeight != height) {