Merge branch 'master' of git://localhost/acess2

[tpg/acess2.git] / Usermode / Applications / irc_src / main.c

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