X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Firc_src%2Fmain.c;fp=Usermode%2FApplications%2Firc_src%2Fmain.c;h=09e116417afa36b877b97f865b51be6bea3dc043;hb=45ff232a1db704623e0c4baed011d12cbd44b06e;hp=8336879a4374131dddcc51dc4c52f80b8940ac99;hpb=e7a76b0d8a0cc6aa77966509780973a6f8216ef7;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/irc_src/main.c b/Usermode/Applications/irc_src/main.c
index 8336879a..09e11641 100644
--- a/Usermode/Applications/irc_src/main.c
+++ b/Usermode/Applications/irc_src/main.c
@@ -103,6 +103,16 @@ int main(int argc, const char *argv[], const char *envp[])
 	
 	atexit(ExitHandler);
 	
+<<<<<<< HEAD
+	if( _SysIOCtl(1, DRV_IOCTL_TYPE, NULL) != DRV_TYPE_TERMINAL ) {
+		printf(stderr, "note: assuming 80x25, can't get terminal dimensions\n");
+		giTerminal_Width = 80;
+		giTerminal_Height = 25;
+	}
+	else {
+		struct ptydims	dims;
+		_SysIOCtl(1, PTY_IOCTL_GETDIMS, &dims);
+=======
 	{
 		struct ptydims	dims;
 		if( _SysIOCtl(1, PTY_IOCTL_GETDIMS, &dims) ) {
@@ -110,6 +120,7 @@ int main(int argc, const char *argv[], const char *envp[])
 			return 1;
 		}
 		
+>>>>>>> e7a76b0d8a0cc6aa77966509780973a6f8216ef7
 		giTerminal_Width = dims.W;
 		giTerminal_Height = dims.H;
 	}