Build fixes to build cleanly on OS X; switch from makefile.lnx to

makefile.osx in the master makefile to build.

Note that this checkin adds comments to the start of each modified file
tagging the file as modified by Crawl Reference; the license requires this,
so we should be careful to stick with it.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 6 insertions, 4 deletions

diff --git a/trunk/source/files.cc b/trunk/source/files.cc
index 65fb795e60..56fc9bfd78 100644
--- a/trunk/source/files.cc
+++ b/trunk/source/files.cc
@@ -3,6 +3,8 @@
  *  Summary:    Functions used to save and load levels/games.
  *  Written by: Linley Henzell and Alexey Guzeev
  *
+ *  Modified for Crawl Reference by $Author$ on $Date$
+ *
  *  Change History (most recent first):
  *
  *   <7>   19 June 2000  GDL    Change handle to FILE *
@@ -461,8 +463,8 @@ void load( unsigned char stair_taken, int load_mode, bool was_a_labyrinth,
         // BEGIN -- must load the old level : pre-load tasks
 
         // LOAD various tags
-        char majorVersion;
-        char minorVersion;
+        char majorVersion = 0;
+        char minorVersion = 0;
 
         if (!determine_level_version( levelFile, majorVersion, minorVersion ))
         {
@@ -1122,8 +1124,8 @@ void restore_game(void)
         end(-1);
     }
 
-    char majorVersion;
-    char minorVersion;
+    char majorVersion = 0;
+    char minorVersion = 0;
 
     if (!determine_version(restoreFile, majorVersion, minorVersion))
     {