From a598f365021d991a932b2495081c6b5745b6f6cb Mon Sep 17 00:00:00 2001
From: terminx <terminx@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Wed, 26 Mar 2008 09:28:21 +0000
Subject: [PATCH] git-svn-id: https://svn.eduke32.com/eduke32@663
 1a8010ca-5511-0410-912e-c29ae57300e0

---
 polymer/build/Makefile            | 2 +-
 polymer/build/include/compat.h    | 2 +-
 polymer/build/include/glbuild.h   | 2 +-
 polymer/eduke32/source/gameexec.c | 8 +++-----
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/polymer/build/Makefile b/polymer/build/Makefile
index 8632acee7..4f7aeff39 100644
--- a/polymer/build/Makefile
+++ b/polymer/build/Makefile
@@ -19,7 +19,7 @@ POLYMOST ?= 1
 USE_OPENGL ?= 1
 NOASM ?= 0
 LINKED_GTK ?= 0
-BUILD32_ON_64 ?= 1
+BUILD32_ON_64 ?= 0
 
 # Debugging options
 #  RELEASE - 1 = no debugging
diff --git a/polymer/build/include/compat.h b/polymer/build/include/compat.h
index b52c1c43d..51460e757 100644
--- a/polymer/build/include/compat.h
+++ b/polymer/build/include/compat.h
@@ -6,7 +6,7 @@
 #define __compat_h__
 
 #ifndef UNREFERENCED_PARAMETER
-#define UNREFERENCED_PARAMETER(x) x=x
+    #define UNREFERENCED_PARAMETER(x) x=x
 #endif
 
 // This gives us access to 'intptr_t' and 'uintptr_t', which are
diff --git a/polymer/build/include/glbuild.h b/polymer/build/include/glbuild.h
index 1ca5dfa42..db7530251 100644
--- a/polymer/build/include/glbuild.h
+++ b/polymer/build/include/glbuild.h
@@ -183,7 +183,7 @@ extern void (APIENTRY * bglBeginQueryARB)(GLenum target, GLuint id);
 extern void (APIENTRY * bglEndQueryARB)(GLenum target);
 extern void (APIENTRY * bglGetQueryivARB)(GLenum target, GLenum pname, GLint *params);
 extern void (APIENTRY * bglGetQueryObjectivARB)(GLuint id, GLenum pname, GLint *params);
-extern void (APIENTRY * bglGetQueryObjectuivARB)(uint id, GLenum pname, GLuint *params);
+extern void (APIENTRY * bglGetQueryObjectuivARB)(GLuint id, GLenum pname, GLuint *params);
 
 // GLU
 extern void             (APIENTRY * bgluTessBeginContour) (GLUtesselator* tess);
diff --git a/polymer/eduke32/source/gameexec.c b/polymer/eduke32/source/gameexec.c
index f491f4fbe..1e8ba4b09 100644
--- a/polymer/eduke32/source/gameexec.c
+++ b/polymer/eduke32/source/gameexec.c
@@ -426,12 +426,10 @@ static void DoUserDef(int iSet, int lLabelID, int lVar2)
     case USERDEFS_SCREEN_SIZE:
         if (iSet)
         {
+            if (ud.screen_size != lValue)
             {
-                if (ud.screen_size != lValue)
-                {
-                    ud.screen_size = lValue;
-                    vscrn();
-                }
+                ud.screen_size = lValue;
+                vscrn();
             }
             return;
         }