Batch of tiny changes for MSVC compiles.

Most of these fall into the category:
- don't use struct to refer to a class, and vice versa
- msvc doesn't like unistd.h or dirent.h

Doesn't fix all the struct/class problems; I think I'll silence
those for now and move on because it's not all that important.

Tested on OS X.



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

1 files changed, 6 insertions, 6 deletions

diff --git a/crawl-ref/source/mstuff2.h b/crawl-ref/source/mstuff2.h
index 26fc063909..d168e2b946 100644
--- a/crawl-ref/source/mstuff2.h
+++ b/crawl-ref/source/mstuff2.h
@@ -44,7 +44,7 @@ bolt mons_spells(int spell_cast, int power);
 /* ***********************************************************************
  * called from: monstuff
  * *********************************************************************** */
-void setup_dragon(struct monsters *monster, struct bolt &pbolt);
+void setup_dragon(monsters *monster, struct bolt &pbolt);
 
 
 // last updated 13feb2001 {gdl}
@@ -63,7 +63,7 @@ void setup_mons_cast(const monsters *monster, bolt &pbolt, int spell_cast);
 /* ***********************************************************************
  * called from: monstuff
  * *********************************************************************** */
-bool mons_throw(struct monsters *monster, struct bolt &pbolt, int hand_used);
+bool mons_throw(monsters *monster, struct bolt &pbolt, int hand_used);
 
 bool mons_thrown_object_destroyed( item_def *item, int x, int y,
                                    bool returning, int midx );
@@ -72,20 +72,20 @@ bool mons_thrown_object_destroyed( item_def *item, int x, int y,
 /* ***********************************************************************
  * called from: monstuff
  * *********************************************************************** */
-void setup_generic_throw(struct monsters *monster, struct bolt &pbolt);
+void setup_generic_throw(monsters *monster, struct bolt &pbolt);
 
 // last updated 12may2000 {dlb}
 /* ***********************************************************************
  * called from: monstuff
  * *********************************************************************** */
-void mons_trap(struct monsters *monster);
+void mons_trap(monsters *monster);
 
 
 // last updated 12may2000 {dlb}
 /* ***********************************************************************
  * called from: beam - fight - files - monstuff - mstuff2 - spells4
  * *********************************************************************** */
-void monster_teleport(struct monsters *monster, bool instan, 
+void monster_teleport(monsters *monster, bool instan, 
                       bool silent = false);
 
 
@@ -93,7 +93,7 @@ void monster_teleport(struct monsters *monster, bool instan,
 /* ***********************************************************************
  * called from: monstuff
  * *********************************************************************** */
-void spore_goes_pop(struct monsters *monster);
+void spore_goes_pop(monsters *monster);
 
 bool orc_battle_cry(monsters *chief);
 bool orange_statue_effects(monsters *mons);