From 5007ae92ae2dccd2dd110a162bc490e470c727f1 Mon Sep 17 00:00:00 2001
From: James Haley <haleyjd@hotmail.com>
Date: Tue, 12 May 2009 13:40:38 -0500
Subject: [PATCH] Minor adjustments in preparation for build 3 release.

---
 Source/m_misc.c   | 2 ++
 Source/p_genlin.c | 4 ----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Source/m_misc.c b/Source/m_misc.c
index 3bd5b18a..4db73a09 100644
--- a/Source/m_misc.c
+++ b/Source/m_misc.c
@@ -77,6 +77,7 @@ extern int tran_filter_pct;            // killough 2/21/98
 extern int screenblocks;
 extern int showMessages;
 
+#ifdef MY_SDL_VER
 extern int i_SDLJoystickNum;
 extern int joystickSens_x;
 extern int joystickSens_y;
@@ -85,6 +86,7 @@ extern int forceFlipPan;
 extern int grabmouse;
 extern int cfg_scalefactor; // haleyjd 05/11/09
 extern int cfg_aspectratio; // haleyjd 05/11/09
+#endif
 
 extern char *chat_macros[], *wad_files[], *deh_files[];  // killough 10/98
 
diff --git a/Source/p_genlin.c b/Source/p_genlin.c
index 0b3e58ce..30cfa8e2 100644
--- a/Source/p_genlin.c
+++ b/Source/p_genlin.c
@@ -387,13 +387,9 @@ manual_ceiling:
     //Dirn? ceiling->topheight : ceiling->bottomheight = targheight;
     // haleyjd: that's GNU C syntax up there.
     if(Dirn)
-    {
        ceiling->topheight = targheight;
-    }
     else
-    {
        ceiling->bottomheight = targheight;
-    }
 
     // set texture/type change properties
     if (ChgT)     // if a texture change is indicated