diff options
| author | pauldubois <pauldubois@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-10 07:05:58 +0000 |
|---|---|---|
| committer | pauldubois <pauldubois@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-10 07:05:58 +0000 |
| commit | 6b30618d321c3a9521d9fcb1f01b023cbd4acae4 (patch) | |
| tree | 4ffe0c85f10edfe442faf65babe62cd2b42a3099 /crawl-ref/source/libutil.cc | |
| parent | dd916b6a6dc736d18f47428be0694479714e3dfe (diff) | |
| download | crawl-ref-6b30618d321c3a9521d9fcb1f01b023cbd4acae4.tar.gz crawl-ref-6b30618d321c3a9521d9fcb1f01b023cbd4acae4.zip | |
Fix some link errors and a few remaining compile warnings (the
ones that aren't bugs)
- if static const int foo=VALUE; is in header, don't need to have
a definition in a .cc file. The definition goes into every .cc
file with "vague linkage"
- add sqlite and lua to the sln/vcproj
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3576 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/libutil.cc')
| -rw-r--r-- | crawl-ref/source/libutil.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crawl-ref/source/libutil.cc b/crawl-ref/source/libutil.cc index 52fa9094d1..afeff90058 100644 --- a/crawl-ref/source/libutil.cc +++ b/crawl-ref/source/libutil.cc @@ -26,7 +26,9 @@ #include <string.h> #if defined(WIN32CONSOLE) || defined(WIN32TILES) + #undef ARRAYSIZE #include <windows.h> + #undef max #ifdef WINMM_PLAY_SOUNDS #include <mmsystem.h> |