diff options
| author | Tobias Kortkamp <tobik@FreeBSD.org> | 2020-03-18 07:54:37 +0000 |
|---|---|---|
| committer | Tobias Kortkamp <tobik@FreeBSD.org> | 2020-03-18 07:54:37 +0000 |
| commit | 61838c3a6dfed88ab8847098f378a8b8c61d60a1 (patch) | |
| tree | 4f60a891d4078c4c99d27fafd4b91588c5b92e3d /games | |
| parent | 16c5adc3737261bdc2f3cff0615ca3736c83e482 (diff) | |
| download | ports-61838c3a6dfed88ab8847098f378a8b8c61d60a1.tar.gz ports-61838c3a6dfed88ab8847098f378a8b8c61d60a1.zip | |
games/seabattle: Fix build after ncurses update(?)
In file included from binp.c:6:
./batt.h:57:6: error: conflicting types for 'exit_curses'
void exit_curses(void);
^
/usr/include/curses.h:2093:29: note: previous declaration is here
extern NCURSES_EXPORT(void) exit_curses (int) GCC_NORETURN;
^
binp.c:45:6: error: conflicting types for 'exit_curses'
void exit_curses(void) /* Shutdown curses nicely so the */
^
Notes
Notes:
svn path=/head/; revision=528633
Diffstat (limited to 'games')
| -rw-r--r-- | games/seabattle/files/patch-batt.h | 13 | ||||
| -rw-r--r-- | games/seabattle/files/patch-binp.c | 24 |
2 files changed, 32 insertions, 5 deletions
diff --git a/games/seabattle/files/patch-batt.h b/games/seabattle/files/patch-batt.h index 57484ef07ec6..5a75ce1abeac 100644 --- a/games/seabattle/files/patch-batt.h +++ b/games/seabattle/files/patch-batt.h @@ -1,5 +1,5 @@ ---- batt.h.orig Wed May 14 04:58:17 1997 -+++ batt.h Fri Feb 2 04:18:06 2001 +--- batt.h.orig 1997-05-13 19:58:17 UTC ++++ batt.h @@ -2,7 +2,7 @@ * batt.h Part of the SEABATTLE game by Vince Weaver * ************************************************************************/ @@ -9,3 +9,12 @@ #include <stdio.h> #include <ctype.h> #include <stdlib.h> +@@ -54,7 +54,7 @@ DATA *current_player; + + /* binp.c */ + void init_curses(void); /* All the function declarations */ +-void exit_curses(void); ++void exit_curses_(void); + void set_color(int color,int bold); + void printxy(int x,int y,char *tempst); + void draw_opening(void); diff --git a/games/seabattle/files/patch-binp.c b/games/seabattle/files/patch-binp.c index fe9699e510f6..05de31168bb6 100644 --- a/games/seabattle/files/patch-binp.c +++ b/games/seabattle/files/patch-binp.c @@ -1,6 +1,15 @@ ---- binp.c.orig Wed May 14 02:51:00 1997 -+++ binp.c Fri Feb 2 04:22:56 2001 -@@ -129,15 +129,15 @@ +--- binp.c.orig 1997-05-13 17:51:00 UTC ++++ binp.c +@@ -42,7 +42,7 @@ void printxy(int x,int y,char *tempst) /* Simple f + } + + +-void exit_curses(void) /* Shutdown curses nicely so the */ ++void exit_curses_(void) /* Shutdown curses nicely so the */ + { /* terminal works properly */ + clear(); + refresh(); +@@ -129,15 +129,15 @@ void do_sound(int which_one) /* Plays ap /* Incomplete as of yet */ if (which_one==1) if (sound_device) @@ -21,3 +30,12 @@ else beep(); } +@@ -330,7 +330,7 @@ void quit(void) /* Create a + wclear(quit_window); + wrefresh(quit_window); + delwin(quit_window); +- if ((ch=='Y') || (ch=='y')) {exit_curses(); exit(0); } ++ if ((ch=='Y') || (ch=='y')) {exit_curses_(); exit(0); } + #ifndef BROKEN_CURSES + redrawwin(stdscr); + #endif |