diff options
author | pauldubois <pauldubois@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-10 03:30:55 +0000 |
---|---|---|
committer | pauldubois <pauldubois@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-10 03:30:55 +0000 |
commit | 77b5cadac636ddee4ed39bcaf1344c270fcaa447 (patch) | |
tree | 909c1ce1e1fa67eb83548c97790da2287c4d01e1 /crawl-ref/source/externs.h | |
parent | de978e5fed84aaa1b077fed70b93eba1a3d82edc (diff) | |
download | crawl-ref-77b5cadac636ddee4ed39bcaf1344c270fcaa447.tar.gz crawl-ref-77b5cadac636ddee4ed39bcaf1344c270fcaa447.zip |
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
Diffstat (limited to 'crawl-ref/source/externs.h')
-rw-r--r-- | crawl-ref/source/externs.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/crawl-ref/source/externs.h b/crawl-ref/source/externs.h index 2fb110a339..60e4a1abb2 100644 --- a/crawl-ref/source/externs.h +++ b/crawl-ref/source/externs.h @@ -70,9 +70,9 @@ const int kPathLen = 256; // penalty (Xom's granted or from a deck of cards). #define NO_BERSERK_PENALTY -1 -class item_def; +struct item_def; class melee_attack; -class coord_def; +struct coord_def; class level_id; class actor @@ -1291,7 +1291,7 @@ struct map_cell }; class map_marker; -class tagHeader; +struct tagHeader; class map_markers { public: @@ -1869,4 +1869,8 @@ private: extern game_options Options; +#if _MSC_VER +# include "msvc.h" +#endif + #endif // EXTERNS_H |