Patches from debian package (Guus Sliepen.)

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

8 files changed, 11 insertions, 6 deletions

diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index 1939c36819..a7ea81c9e2 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -82,7 +82,7 @@ static void append_value( std::string & description, int valu, bool plussed )
 //---------------------------------------------------------------
 static void print_description( const std::string &d )
 {
-    unsigned int  nextLine = std::string::npos;
+    std::string::size_type nextLine = std::string::npos;
     unsigned int  currentPos = 0;
 
     const unsigned int lineWidth = 70;
diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc
index 523012a1d0..8597e53ac3 100644
--- a/crawl-ref/source/dungeon.cc
+++ b/crawl-ref/source/dungeon.cc
@@ -3525,7 +3525,7 @@ void give_armour(monsters *mon, int level)
         break;
 
     case MONS_ORC_WARLORD:
-        // being at the top has it's priviledges
+        // being at the top has its privileges
         if (one_chance_in(3))
             level = MAKE_GOOD_ITEM;
         // deliberate fall through
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc
index 8ad6f87067..7c51e472d8 100644
--- a/crawl-ref/source/effects.cc
+++ b/crawl-ref/source/effects.cc
@@ -13,6 +13,7 @@
 #include "AppHdr.h"
 #include "effects.h"
 
+#include <cstdlib>
 #include <string.h>
 #include <stdio.h>
 
diff --git a/crawl-ref/source/it_use3.cc b/crawl-ref/source/it_use3.cc
index b01eeb419f..bb231b2e1a 100644
--- a/crawl-ref/source/it_use3.cc
+++ b/crawl-ref/source/it_use3.cc
@@ -16,6 +16,7 @@
 #include "AppHdr.h"
 #include "it_use3.h"
 
+#include <cstdlib>
 #include <string.h>
 
 #include "externs.h"
diff --git a/crawl-ref/source/libunix.cc b/crawl-ref/source/libunix.cc
index 1ef0d2ea45..65eac622ef 100644
--- a/crawl-ref/source/libunix.cc
+++ b/crawl-ref/source/libunix.cc
@@ -332,6 +332,9 @@ void unixcurses_startup( void )
 
 void unixcurses_shutdown()
 {
+    // resetty();
+    endwin();
+
     tcsetattr(0, TCSAFLUSH, &def_term);
 
 #ifdef USE_UNIX_SIGNALS
@@ -343,9 +346,6 @@ void unixcurses_shutdown()
     signal(SIGINT, SIG_DFL);
 #endif
 #endif
-
-    // resetty();
-    endwin();
 }
 
 
diff --git a/crawl-ref/source/randart.cc b/crawl-ref/source/randart.cc
index 97218ee036..2cfa9ec8aa 100644
--- a/crawl-ref/source/randart.cc
+++ b/crawl-ref/source/randart.cc
@@ -17,6 +17,8 @@
 #include "AppHdr.h"
 #include "randart.h"
 
+#include <cstdlib>
+#include <climits>
 #include <string.h>
 #include <stdio.h>
 
diff --git a/crawl-ref/source/skills2.cc b/crawl-ref/source/skills2.cc
index 60041b08d7..31832fb5d6 100644
--- a/crawl-ref/source/skills2.cc
+++ b/crawl-ref/source/skills2.cc
@@ -82,7 +82,7 @@ const char *skills[50][6] =
     {NULL},                     // 24- empty
 
     {"Spellcasting", "Magician", "Thaumaturge", "Eclecticist", "Sorcerer", "Archmage"},     // 25
-    {"Conjurations", "Ruinous", "Conjurer", "Destroyer", "Devastator", "Annihilator"},
+    {"Conjurations", "Ruiner", "Conjurer", "Destroyer", "Devastator", "Annihilator"},
     {"Enchantments", "Charm-Maker", "Infuser", "Bewitcher", "Enchanter", "Spellbinder"},
     {"Summonings", "Caller", "Summoner", "Convoker", "Demonologist", "Hellbinder"},
     {"Necromancy", "Grave Robber", "Reanimator", "Necromancer", "Thanatomancer", "%s of Death"},
diff --git a/crawl-ref/source/tags.cc b/crawl-ref/source/tags.cc
index 1c75c8a4b2..6cebd63dc1 100644
--- a/crawl-ref/source/tags.cc
+++ b/crawl-ref/source/tags.cc
@@ -55,6 +55,7 @@
 
 */
 
+#include <cstdlib>
 #include <stdio.h>
 #include <string.h>            // for memcpy