don't redeclare termcap in a conflicting way. fixes gcc4
This commit is contained in:
parent
ad1895e37b
commit
0062941a95
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-include_system_h,v 1.3 2004/08/11 10:15:07 espie Exp $
|
||||
$OpenBSD: patch-include_system_h,v 1.4 2010/05/19 07:27:25 espie Exp $
|
||||
--- include/system.h.orig Mon Dec 8 00:39:13 2003
|
||||
+++ include/system.h Tue Aug 10 13:34:10 2004
|
||||
@@ -521,11 +521,15 @@ E struct tm *FDECL(localtime, (const tim
|
||||
+++ include/system.h Wed May 19 06:01:29 2010
|
||||
@@ -521,11 +521,15 @@ E struct tm *FDECL(localtime, (const time_t *));
|
||||
# endif
|
||||
# endif
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-sys_unix_Makefile_src,v 1.8 2004/08/11 10:15:07 espie Exp $
|
||||
$OpenBSD: patch-sys_unix_Makefile_src,v 1.9 2010/05/19 07:27:25 espie Exp $
|
||||
--- sys/unix/Makefile.src.orig Mon Dec 8 00:39:13 2003
|
||||
+++ sys/unix/Makefile.src Tue Aug 10 13:36:00 2004
|
||||
+++ sys/unix/Makefile.src Wed May 19 06:01:29 2010
|
||||
@@ -1,6 +1,7 @@
|
||||
# NetHack Makefile.
|
||||
# SCCS Id: @(#)Makefile.src 3.4 2002/03/02
|
||||
@ -9,7 +9,7 @@ $OpenBSD: patch-sys_unix_Makefile_src,v 1.8 2004/08/11 10:15:07 espie Exp $
|
||||
# newer makes predefine $(MAKE) to 'make' and do smarter processing of
|
||||
# recursive make calls if $(MAKE) is used
|
||||
# these makes allow $(MAKE) to be overridden by the environment if someone
|
||||
@@ -151,8 +152,7 @@ GNOMEINC=-I/usr/lib/glib/include -I/usr/
|
||||
@@ -151,8 +152,7 @@ GNOMEINC=-I/usr/lib/glib/include -I/usr/lib/gnome-libs
|
||||
# flags for debugging:
|
||||
# CFLAGS = -g -I../include
|
||||
|
||||
|
14
games/nethack/patches/patch-win_tty_termcap_c
Normal file
14
games/nethack/patches/patch-win_tty_termcap_c
Normal file
@ -0,0 +1,14 @@
|
||||
$OpenBSD: patch-win_tty_termcap_c,v 1.1 2010/05/19 07:27:25 espie Exp $
|
||||
--- win/tty/termcap.c.orig Wed May 19 09:21:20 2010
|
||||
+++ win/tty/termcap.c Wed May 19 09:21:53 2010
|
||||
@@ -835,8 +835,10 @@ cl_eos() /* free after Robert Viduya */
|
||||
|
||||
#include <curses.h>
|
||||
|
||||
+#ifndef __OpenBSD__
|
||||
#ifndef LINUX
|
||||
extern char *tparm();
|
||||
+#endif
|
||||
#endif
|
||||
|
||||
# ifdef COLOR_BLACK /* trust include file */
|
Loading…
Reference in New Issue
Block a user