From 6e9294e05572d46d3897744d78f4604b412ceb65 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sun, 8 May 2011 00:31:01 +0000
Subject: Shut up compiler warnings.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2333
---
 src/deh_io.c  | 2 +-
 src/i_scale.c | 1 +
 src/p_setup.c | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/deh_io.c b/src/deh_io.c
index 92c81632..83609068 100644
--- a/src/deh_io.c
+++ b/src/deh_io.c
@@ -181,7 +181,7 @@ int DEH_GetCharLump(deh_context_t *context)
 
 int DEH_GetChar(deh_context_t *context)
 {
-    int result;
+    int result = 0;
 
     // Read characters, but ignore carriage returns
     // Essentially this is a DOS->Unix conversion
diff --git a/src/i_scale.c b/src/i_scale.c
index 0b702311..8cecb1f8 100644
--- a/src/i_scale.c
+++ b/src/i_scale.c
@@ -30,6 +30,7 @@
 #include "doomtype.h"
 
 #include "i_video.h"
+#include "m_argv.h"
 #include "z_zone.h"
 
 #if defined(_MSC_VER) && !defined(__cplusplus)
diff --git a/src/p_setup.c b/src/p_setup.c
index e18ec81e..58d5f462 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -700,7 +700,7 @@ static void PadRejectArray(byte *array, unsigned int len)
     if (len > sizeof(rejectpad))
     {
         fprintf(stderr, "PadRejectArray: REJECT lump too short to pad! (%i > %i)\n",
-                        len, sizeof(rejectpad));
+                        len, (int) sizeof(rejectpad));
 
         // Pad remaining space with 0 (or 0xff, if specified on command line).
 
-- 
cgit v1.2.3