From 56e6e8c6653dbe22ff5cb505eb42eadb607c67b1 Mon Sep 17 00:00:00 2001 From: nisstyre56 Date: Mon, 14 Jul 2014 02:32:52 -0400 Subject: [PATCH 1/2] typo in header include, errnos.h should be errno.h --- linuxdoom-1.10/i_video.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linuxdoom-1.10/i_video.c b/linuxdoom-1.10/i_video.c index 9b311b39a..c3f45557b 100644 --- a/linuxdoom-1.10/i_video.c +++ b/linuxdoom-1.10/i_video.c @@ -46,7 +46,7 @@ int XShmGetEventBase( Display* dpy ); // problems with g++? #include #include -#include +#include #include #include "doomstat.h" From 772a96179bfe1761aed3c5c22b65f87ef3506221 Mon Sep 17 00:00:00 2001 From: nisstyre56 Date: Thu, 17 Jul 2014 15:32:21 -0400 Subject: [PATCH 2/2] fix build error --- linuxdoom-1.10/i_sound.c | 2 +- linuxdoom-1.10/i_video.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/linuxdoom-1.10/i_sound.c b/linuxdoom-1.10/i_sound.c index a327bfa29..ee18e19c6 100644 --- a/linuxdoom-1.10/i_sound.c +++ b/linuxdoom-1.10/i_sound.c @@ -24,6 +24,7 @@ static const char rcsid[] = "$Id: i_unix.c,v 1.5 1997/02/03 22:45:10 b1 Exp $"; +#include #include #include #include @@ -163,7 +164,6 @@ myioctl int* arg ) { int rc; - extern int errno; rc = ioctl(fd, command, arg); if (rc < 0) diff --git a/linuxdoom-1.10/i_video.c b/linuxdoom-1.10/i_video.c index c3f45557b..2b07fa2aa 100644 --- a/linuxdoom-1.10/i_video.c +++ b/linuxdoom-1.10/i_video.c @@ -768,7 +768,7 @@ void I_InitGraphics(void) // use the default visual X_screen = DefaultScreen(X_display); - if (!XMatchVisualInfo(X_display, X_screen, 8, PseudoColor, &X_visualinfo)) + if (!XMatchVisualInfo(X_display, X_screen, 4, PseudoColor, &X_visualinfo)) I_Error("xdoom currently only supports 256-color PseudoColor screens"); X_visual = X_visualinfo.visual;