From 2a1d816aed9b56a5faf400f3cbb2fd8d9ed0ba23 Mon Sep 17 00:00:00 2001
From: TimeServ <timeserv@users.sourceforge.net>
Date: Wed, 5 Apr 2006 04:31:05 +0000
Subject: [PATCH] fix GL Release build issue, update msvc2005 project
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2158 fc73d0e0-1445-4013-8a0c-d673dee63da5
---
engine/dotnet2005/ftequake.vcproj | 10 +++++-----
engine/http/httpserver.c | 6 +++---
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/engine/dotnet2005/ftequake.vcproj b/engine/dotnet2005/ftequake.vcproj
index fe821b89b..6e398c624 100644
--- a/engine/dotnet2005/ftequake.vcproj
+++ b/engine/dotnet2005/ftequake.vcproj
@@ -1247,8 +1247,8 @@
</Configuration>
<Configuration
Name="GLRelease|Win32"
- OutputDirectory=".\ftequake___Win32_GLRelease"
- IntermediateDirectory=".\ftequake___Win32_GLRelease"
+ OutputDirectory=".\GLRelease"
+ IntermediateDirectory=".\GLRelease"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
UseOfMFC="0"
@@ -1289,9 +1289,9 @@
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="quakedef.h"
PrecompiledHeaderFile=".\ftequake___Win32_GLRelease/ftequake.pch"
- AssemblerListingLocation=".\ftequake___Win32_GLRelease/"
- ObjectFile=".\ftequake___Win32_GLRelease/"
- ProgramDataBaseFileName=".\ftequake___Win32_GLRelease/"
+ AssemblerListingLocation=".\GLRelease/"
+ ObjectFile=".\GLRelease/"
+ ProgramDataBaseFileName=".\GLRelease/"
BrowseInformation="1"
WarningLevel="3"
SuppressStartupBanner="true"
diff --git a/engine/http/httpserver.c b/engine/http/httpserver.c
index a4e95dc03..50785cd6d 100644
--- a/engine/http/httpserver.c
+++ b/engine/http/httpserver.c
@@ -137,7 +137,7 @@ void HTTP_RunExisting (void)
int contentlen;
int HTTPmarkup; //version
- int errno;
+ int localerrno;
HTTP_active_connections_t *prev, *cl = HTTP_ServerConnections;
@@ -436,8 +436,8 @@ notimplemented:
if (ammount == -1)
{
- errno = qerrno;
- if (errno != EWOULDBLOCK)
+ localerrno = qerrno;
+ if (localerrno != EWOULDBLOCK)
{
cl->close = true;
}