diff options
author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-19 23:13:26 +0000 |
---|---|---|
committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-19 23:13:26 +0000 |
commit | 9ba57ee3a6f72308ff01263dfe143cf23c1cf321 (patch) | |
tree | 968cb123684f700f4a612804f8670b0e8e049a93 /crawl-ref/source/defines.h | |
parent | 003c3dc779fbd0ba44bc4fafadafb45db537fda7 (diff) | |
download | crawl-ref-9ba57ee3a6f72308ff01263dfe143cf23c1cf321.tar.gz crawl-ref-9ba57ee3a6f72308ff01263dfe143cf23c1cf321.zip |
Fixes to compile with Visual C++. Moved direct.cc and direct.h to directn.* to avoid conflict with VC++ direct.h header.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4390 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/defines.h')
-rw-r--r-- | crawl-ref/source/defines.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/defines.h b/crawl-ref/source/defines.h index a028036591..d899dda451 100644 --- a/crawl-ref/source/defines.h +++ b/crawl-ref/source/defines.h @@ -299,8 +299,8 @@ const int LABYRINTH_BORDER = 4; // it wants to be used in case labels. #define CONTROL( xxx ) ((xxx) - 'A' + 1) -#define ARRAYSIZE(x) (sizeof(x) / sizeof(x[0])) -#define RANDOM_ELEMENT(x) (x[random2(ARRAYSIZE(x))]) +#define ARRAYSZ(x) (sizeof(x) / sizeof(x[0])) +#define RANDOM_ELEMENT(x) (x[random2(ARRAYSZ(x))]) #define MIN(x, y) MINIMUM(x, y) #define MAX(x,y) (((x) > (y)) ? (x) : (y)) |