Date: Wed, 18 Mar 2020 07:54:37 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r528633 - head/games/seabattle/files Message-ID: <202003180754.02I7sb89034737@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Wed Mar 18 07:54:37 2020 New Revision: 528633 URL: https://svnweb.freebsd.org/changeset/ports/528633 Log: 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 */ ^ Modified: head/games/seabattle/files/patch-batt.h head/games/seabattle/files/patch-binp.c Modified: head/games/seabattle/files/patch-batt.h ============================================================================== --- head/games/seabattle/files/patch-batt.h Wed Mar 18 07:51:58 2020 (r528632) +++ head/games/seabattle/files/patch-batt.h Wed Mar 18 07:54:37 2020 (r528633) @@ -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); Modified: head/games/seabattle/files/patch-binp.c ============================================================================== --- head/games/seabattle/files/patch-binp.c Wed Mar 18 07:51:58 2020 (r528632) +++ head/games/seabattle/files/patch-binp.c Wed Mar 18 07:54:37 2020 (r528633) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003180754.02I7sb89034737>