remove support for GL_EXT_compiled_vertex_array extension

[xonotic/darkplaces.git] / sys_linux.c

diff --git a/sys_linux.c b/sys_linux.c
index 8e042f405a0c9deba593e0541b33fb48f373a68e..c274cf3b361f60855dd9bf7e6a0991ad687eb602 100644 (file)
--- a/sys_linux.c
+++ b/sys_linux.c
@@ -1,6 +1,8 @@
 #include "quakedef.h"
 
 #ifdef WIN32
+#include <windows.h>
+#include <mmsystem.h>
 #include <io.h>
 #include "conio.h"
 #else
@@ -31,7 +33,7 @@ cvar_t sys_useclockgettime = {CVAR_SAVE, "sys_useclockgettime", "0", "use POSIX
 // =======================================================================
 void Sys_Shutdown (void)
 {
-#ifndef WIN32
+#ifdef FNDELAY
        fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY);
 #endif
        fflush(stdout);
@@ -43,7 +45,7 @@ void Sys_Error (const char *error, ...)
        char string[MAX_INPUTLINE];
 
 // change stdin to non blocking
-#ifndef WIN32
+#ifdef FNDELAY
        fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY);
 #endif
 
@@ -59,21 +61,22 @@ void Sys_Error (const char *error, ...)
 
 void Sys_PrintToTerminal(const char *text)
 {
-#ifndef WIN32
+#ifdef FNDELAY
        // BUG: for some reason, NDELAY also affects stdout (1) when used on stdin (0).
        int origflags = fcntl (1, F_GETFL, 0);
        fcntl (1, F_SETFL, origflags & ~FNDELAY);
-#else
+#endif
+#ifdef WIN32
 #define write _write
 #endif
        while(*text)
        {
-               ssize_t written = write(1, text, strlen(text));
+               fs_offset_t written = (fs_offset_t)write(1, text, strlen(text));
                if(written <= 0)
                        break; // sorry, I cannot do anything about this error - without an output
                text += written;
        }
-#ifndef WIN32
+#ifdef FNDELAY
        fcntl (1, F_SETFL, origflags);
 #endif
        //fprintf(stdout, "%s", text);
@@ -90,7 +93,6 @@ double Sys_DoubleTime (void)
                return ((double) benchmark_time) / 1e6;
        }
 #ifdef WIN32
-#include <mmsystem.h>
        // LordHavoc: note to people modifying this code, DWORD is specifically defined as an unsigned 32bit number, therefore the 65536.0 * 65536.0 is fine.
        if (sys_usetimegettime.integer)
        {
@@ -234,11 +236,14 @@ char *Sys_ConsoleInput(void)
                timeout.tv_usec = 0;
                if (select (1, &fdset, NULL, NULL, &timeout) != -1 && FD_ISSET(0, &fdset))
                {
-                       len = read (0, text, sizeof(text));
+                       len = read (0, text, sizeof(text) - 1);
                        if (len >= 1)
                        {
                                // rip off the \n and terminate
-                               text[len-1] = 0;
+                               // div0: WHY? console code can deal with \n just fine
+                               // this caused problems with pasting stuff into a terminal window
+                               // so, not ripping off the \n, but STILL keeping a NUL terminator
+                               text[len] = 0;
                                return text;
                        }
                }
@@ -289,7 +294,7 @@ int main (int argc, char **argv)
        com_argc = argc;
        com_argv = (const char **)argv;
 
-#ifndef WIN32
+#ifdef FNDELAY
        fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY);
 #endif