fiddlerwoaroof/crawl - Change L3DRKFURVDCV3EJKGG6GVVQX3D5MZPICTVOKNOD3LGM2PECBA7PQC

Another batch of msvc compile fixes.

Added wrapper implementation for opendir/readdir Other functions left stubbed out. It's a shame that crawl's "direct.h" conflicts with <direct.h>. Fixed up use of AppHdr.h in a couple places (it must be included first); changed project to use precompiled headers.

crawl now compiles cleanly but doesn't link.

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

Created by pauldubois on March 10, 2008

L3DRKFURVDCV3EJKGG6GVVQX3D5MZPICTVOKNOD3LGM2PECBA7PQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/tutorial.cc at line 11 [9.5936]
B:BD[7.1317] → [8.344:366]
```
#include "tutorial.h"
```
[7.1317]
[10.1129]
```
#include "AppHdr.h"
```
Insertion in crawl-ref/source/tutorial.cc at line 16 [9.5936]
[10.1168]
[11.1461]
```
#include "tutorial.h"
```
Replacement in crawl-ref/source/tile2.cc at line 8 [12.13289]
∅:D[5.1013] → [12.13290:13306]
B:BD[12.13289] → [12.13290:13306]
```
#ifdef USE_TILE
```
[5.1013]
[12.13306]
```
#include "AppHdr.h"
```
Insertion in crawl-ref/source/tile2.cc at line 10 [12.13289]
[12.13307]
[12.13307]
```
#ifdef USE_TILE
```
Deletion in crawl-ref/source/tile2.cc at line 15 [12.13289]
B:BD[12.13367] → [12.13367:13387]
```
#include "AppHdr.h"
```
Insertion in crawl-ref/source/tile1.cc at line 8 [12.96318]
[5.1187]
[12.96319]
```
#include "AppHdr.h"
```
Deletion in crawl-ref/source/tile1.cc at line 10 [12.96318]
B:BD[12.96335] → [12.96335:96336]
Deletion in crawl-ref/source/tile1.cc at line 11 [12.96318]
B:BD[12.96355] → [12.96355:96375]
```
#include "AppHdr.h"
```

Replacement in crawl-ref/source/tags.cc at line 1130 [14.164589]

B:BD[13.1400] → [13.1400:1439]

                      marshallString);

[13.1400]

[13.1439]

                      marshall_string);

Replacement in crawl-ref/source/tags.cc at line 1132 [14.164589]

B:BD[13.1519] → [13.1519:1558]

                      marshallString);

[13.1519]

[14.186830]

                      marshall_string);

Replacement in crawl-ref/source/tags.cc at line 1569 [14.164589]

B:BD[13.1966] → [13.1966:2010]

                         unmarshallString);

[13.1966]

[13.2010]

                         unmarshall_string);

Replacement in crawl-ref/source/tags.cc at line 1573 [14.164589]

B:BD[13.2177] → [13.2177:2221]

                         unmarshallString);

[13.2177]

[15.2604]

                         unmarshall_string);

Replacement in crawl-ref/source/religion.cc at line 3616 [14.804403]

B:BD[16.3371] → [16.3371:3438]

        int donation_value = (int) (you.gold/200 * log(you.gold));

[16.3371]

[16.3438]

        int donation_value = (int) (you.gold/200 * log((double)you.gold));

Insertion in crawl-ref/source/notes.cc at line 9 [17.370339]
[17.370403]
[17.370403]
```
#include "AppHdr.h"
```
Deletion in crawl-ref/source/notes.cc at line 14 [17.370339]
B:BD[17.370422] → [17.370422:370442]
```
#include "AppHdr.h"
```

Insertion in crawl-ref/source/msvc.h at line 1 [6.3632]

[6.3632]

[6.3633]

/*
 *  File:       msvc.h
 *  Summary:    Header file for MSVC compiles
 *  Written by: Paul Du Bois
 *
 *  $Author$ on $Date$
 */
#if defined(_MSC_VER)
#define fileno _fileno
#define itoa _itoa

Deletion in crawl-ref/source/msvc.h at line 15 [6.3632]
B:BD[6.3661] → [6.3661:3681]
```
#define itoa _itoa
```
Insertion in crawl-ref/source/msvc.h at line 16 [6.3632]
[6.3710]
[6.3710]
```
#define stricmp _stricmp
#define strlwr _strlwr
```
Replacement in crawl-ref/source/msvc.h at line 22 [6.3632]
B:BD[6.3790] → [6.3790:3834]
```
#if defined(_MSC_VER) || !defined(va_copy)
```
[6.3790]
[6.3834]
```
#if !defined(va_copy)
```

Insertion in crawl-ref/source/msvc.h at line 31 [6.3632]

[6.4047]


// struct vs class XXX: fix these some day!
#pragma warning( disable : 4099 )
// truncating conversions XXX: fix these too!
#pragma warning( disable : 4244 )
// ----------------------------------------------------------------------
// dirent.h replacement
// ----------------------------------------------------------------------
#define DT_DIR 4
#define DT_REG 8
struct DIR;
struct dirent
{
    // ino_t d_ino;
    unsigned short d_reclen;
    unsigned char d_type;
    unsigned short d_namlen;
    char d_name[255];
};
DIR* opendir(const char* path);
dirent* readdir(DIR*);
int closedir(DIR*);
int ftruncate(int fp, int size);
#endif /* defined(_MSC_VER) */

Replacement in crawl-ref/source/misc.cc at line 21 [14.1933596]
B:BD[14.1933981] → [17.542169:542194]
```
#if !defined(__IBMCPP__)
```
[14.1933981]
[14.1934035]
```
#if !defined(__IBMCPP__) && !defined(_MSC_VER)
```
Replacement in crawl-ref/source/misc.cc at line 1843 [14.1933596]
B:BD[18.44588] → [18.44588:44631]
```
            const double log_xp = log(xp);
```
[18.44588]
[18.44631]
```
            const double log_xp = log((double)xp);
```
Replacement in crawl-ref/source/misc.cc at line 1858 [14.1933596]
B:BD[18.44866] → [18.44866:44913]
```
    const double logexp = log(you.experience);
```
[18.44866]
[18.44913]
```
    const double logexp = log((double)you.experience);
```
Insertion in crawl-ref/source/maps.cc at line 21 [14.2007666]
[17.583560]
[19.213]
```
#if !_MSC_VER
```
Insertion in crawl-ref/source/maps.cc at line 23 [14.2007666]
[19.233]
[14.2008079]
```
#endif
```
Insertion in crawl-ref/source/libw32c.cc at line 1 [14.2476860]
[14.2476860]
[18.48908]
```
#include "AppHdr.h"
```
Deletion in crawl-ref/source/libw32c.cc at line 47 [14.2476860]
B:BD[14.2478671] → [14.2478671:2478672]
Insertion in crawl-ref/source/libw32c.cc at line 61 [14.2476860]
[14.2479114]
[20.319]
```
#undef ARRAYSIZE
```
Insertion in crawl-ref/source/libw32c.cc at line 63 [14.2476860]
[20.340]
[14.2479236]
```
#undef max
```
Deletion in crawl-ref/source/libw32c.cc at line 73 [14.2476860]
B:BD[14.2479333] → [14.2479333:2479353]
```
#include "AppHdr.h"
```
Replacement in crawl-ref/source/libw32c.cc at line 871 [14.2476860]
B:BD[21.11416] → [21.11416:11458]
```
                if (kr->bKeyDown == true)
```
[21.11416]
[14.2491632]
```
                if (kr->bKeyDown)
```

Insertion in crawl-ref/source/libw32c.cc at line 1042 [14.2476860]

[22.1750]

[18.48936]


#if _MSC_VER
struct DIR
{
 public:
    DIR()
        : hFind(INVALID_HANDLE_VALUE),
          wfd_valid(false)
    {
        memset(&wfd, 0, sizeof(wfd));
        memset(&entry, 0, sizeof(entry));
    }
    ~DIR()
    {
        if (hFind != INVALID_HANDLE_VALUE)
        {
            FindClose(hFind);
        }
    }
    bool init(const char* szFind)
    {
        // Check that it's a directory, first
        {
            const DWORD dwAttr = GetFileAttributes(szFind);
            if (dwAttr == INVALID_FILE_ATTRIBUTES)
                return false;
            if ((dwAttr & FILE_ATTRIBUTE_DIRECTORY) == 0)
                return false;
        }

Insertion in crawl-ref/source/libw32c.cc at line 1074 [14.2476860]

[18.48937]

        find = szFind;
        find += "\\*";
        hFind = FindFirstFileA(find.c_str(), &wfd);
        wfd_valid = (hFind != INVALID_HANDLE_VALUE);
        return true;
    }
    dirent* readdir()
    {
        if (! wfd_valid) return 0;
        _convert_wfd_to_dirent();
        wfd_valid = (bool) FindNextFileA(hFind, &wfd);
        return &entry;
    }
 private:
    void _convert_wfd_to_dirent()
    {
        entry.d_reclen = sizeof(dirent);
        entry.d_namlen = strlen(entry.d_name);
        entry.d_type = (wfd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
            ? DT_DIR : DT_REG;
        strncpy(entry.d_name, wfd.cFileName, sizeof(entry.d_name));
        entry.d_name[sizeof(entry.d_name)-1] = 0;
    }
 private:
    HANDLE hFind;
    bool wfd_valid;
    WIN32_FIND_DATA wfd;
    std::string find;
    dirent entry;
    // since opendir calls FindFirstFile, we need a means of telling the
    // first call to readdir that we already have a file.
    // that's the case iff this is == 0; we use a counter rather than a
    // flag because that allows keeping statistics.
    int num_entries_scanned;
};
DIR* opendir(char* path)
{
    DIR* d = new DIR();
    if (d->init(path))
    {
        return d;
    }
    else
    {
        delete d;
        return 0;
    }
}
dirent* readdir(DIR* d)
{
    return d->readdir();
}
int closedir(DIR* d)
{
    delete d;
    return 0;
}
int ftruncate(int fp, int size)
{
    ASSERT(false);              // unimplemented
    return 0;
}
#endif /* #if _MSC_VER */

Replacement in crawl-ref/source/libutil.cc at line 398 [14.2494093]
B:BD[23.8218] → [23.8218:8248]
```
    if (!rest and !thousands)
```
[23.8218]
[23.8248]
```
    if (!rest && !thousands)
```

Replacement in crawl-ref/source/initfile.cc at line 2546 [14.2957258]

B:BD[24.422809] → [24.422809:422867]

    else if (key == "menu_colour" || key == "menu_color")

[24.422809]

[24.422867]

    // MSVC has a limit on how many if/else if can be chained together.
    /* else */ if (key == "menu_colour" || key == "menu_color")

Deletion in crawl-ref/source/hiscores.cc at line 34 [14.2987663]
B:BD[14.2988531] → [2.270:290]
```
#include <unistd.h>
```
Insertion in crawl-ref/source/hiscores.cc at line 36 [14.2987663]
[25.288]
[14.2988531]
```
#if !_MSC_VER
#include <unistd.h>
#endif
```
Deletion in crawl-ref/source/hiscores.cc at line 66 [14.2987663]
B:BD[14.2988759] → [14.2988759:2988760]

Replacement in crawl-ref/source/hiscores.cc at line 1005 [14.2987663]

B:BD[17.828468] → [17.828468:828535]

        real_time = you.real_time + (death_time - you.start_time);

[17.828468]

[17.828535]

        real_time = you.real_time + long(death_time - you.start_time);

Replacement in crawl-ref/source/files.cc at line 55 [14.3084589]

B:BD[19.341] → [6.5339:5353]

#if !_MSC_VER

[19.341]

[17.857045]

#if _MSC_VER
// # include <direct.h> conflicts with crawl's header.  Yes this sucks
# include <c:/Program Files/Microsoft Visual Studio 8/VC/include/direct.h>
#else

Replacement in crawl-ref/source/files.cc at line 119 [14.3084589]
B:BD[14.3088157] → [26.23831:23891]
```
const short GHOST_SIGNATURE = static_cast<short>( 0xDC55 );
```
[14.3088157]
[26.23891]
```
const short GHOST_SIGNATURE = short( 0xDC55 );
```
Insertion in crawl-ref/source/files.cc at line 339 [14.3084589]
[3.322]
[17.860187]
```
#elif defined(_MSC_VER)
    return _mkdir(dir);
```

Replacement in crawl-ref/source/dungeon.cc at line 1173 [14.3429798]

B:BD[27.820] → [27.820:892]

        env.rock_colour = fix_black_colour(mcolour[env.mons_alloc[8]]);

[27.820]

[28.12253]

        env.rock_colour = fix_black_colour((char)mcolour[env.mons_alloc[8]]);

Replacement in crawl-ref/source/MSVC/crawl-ref.vcproj at line 23 [4.9337]
B:BD[4.9864] → [4.9864:9885]
```
			CharacterSet="1"
```
[4.9864]
[4.9885]
```
			CharacterSet="0"
```
Replacement in crawl-ref/source/MSVC/crawl-ref.vcproj at line 48 [4.9337]
B:BD[4.10439] → [4.10439:10469]
```
				UsePrecompiledHeader="0"
```
[4.10439]
[4.10469]
```
				UsePrecompiledHeader="2"
				PrecompiledHeaderThrough="AppHdr.h"
```
Replacement in crawl-ref/source/MSVC/crawl-ref.vcproj at line 123 [4.9337]
B:BD[4.11929] → [4.11929:11959]
```
				UsePrecompiledHeader="0"
```
[4.11929]
[4.11959]
```
				UsePrecompiledHeader="2"
				PrecompiledHeaderThrough="AppHdr.h"
```

Insertion in crawl-ref/source/MSVC/crawl-ref.vcproj at line 195 [4.9337]

[4.13141]

			<FileConfiguration
				Name="Debug|Win32"
				>
				<Tool
					Name="VCCLCompilerTool"
					UsePrecompiledHeader="1"
				/>
			</FileConfiguration>
			<FileConfiguration
				Name="Release|Win32"
				>
				<Tool
					Name="VCCLCompilerTool"
					UsePrecompiledHeader="1"
				/>
			</FileConfiguration>

Insertion in crawl-ref/source/MSVC/crawl-ref.vcproj at line 275 [4.9337]

[4.14053]

			<FileConfiguration
				Name="Debug|Win32"
				>
				<Tool
					Name="VCCLCompilerTool"
					UsePrecompiledHeader="0"
				/>
			</FileConfiguration>
			<FileConfiguration
				Name="Release|Win32"
				>
				<Tool
					Name="VCCLCompilerTool"
					UsePrecompiledHeader="0"
				/>
			</FileConfiguration>

Deletion in crawl-ref/source/MSVC/crawl-ref.vcproj at line 434 [4.9337]
B:BD[4.16120] → [4.16120:16178]
```
			>
		</File>
		<File
			RelativePath="..\insult.cc"
```
Deletion in crawl-ref/source/MSVC/crawl-ref.vcproj at line 437 [4.9337]
B:BD[4.16204] → [4.16204:16261]
```
			RelativePath="..\insult.h"
			>
		</File>
		<File
```

Deletion in crawl-ref/source/MSVC/crawl-ref.vcproj at line 506 [4.9337]

B:BD[4.17286] → [4.17286:17633]

			>
		</File>
		<File
			RelativePath="..\libdos.cc"
			>
		</File>
		<File
			RelativePath="..\libdos.h"
			>
		</File>
		<File
			RelativePath="..\libgui.cc"
			>
		</File>
		<File
			RelativePath="..\libgui.h"
			>
		</File>
		<File
			RelativePath="..\libunix.cc"
			>
		</File>
		<File
			RelativePath="..\libunix.h"

Insertion in crawl-ref/source/MSVC/crawl-ref.vcproj at line 519 [4.9337]

[4.17815]

			<FileConfiguration
				Name="Debug|Win32"
				>
				<Tool
					Name="VCCLCompilerTool"
					UsePrecompiledHeader="2"
				/>
			</FileConfiguration>
			<FileConfiguration
				Name="Release|Win32"
				>
				<Tool
					Name="VCCLCompilerTool"
					UsePrecompiledHeader="2"
				/>
			</FileConfiguration>

Deletion in crawl-ref/source/MSVC/crawl-ref.vcproj at line 538 [4.9337]
B:BD[4.17867] → [4.17867:17924]
```
			>
		</File>
		<File
			RelativePath="..\libwt.cc"
```
Deletion in crawl-ref/source/MSVC/crawl-ref.vcproj at line 541 [4.9337]
B:BD[4.17950] → [4.17950:18008]
```
			RelativePath="..\libx11.cc"
			>
		</File>
		<File
```

Insertion in crawl-ref/source/MSVC/crawl-ref.vcproj at line 683 [4.9337]

[4.20075]

			<FileConfiguration
				Name="Debug|Win32"
				>
				<Tool
					Name="VCCLCompilerTool"
					UsePrecompiledHeader="0"
				/>
			</FileConfiguration>
			<FileConfiguration
				Name="Release|Win32"
				>
				<Tool
					Name="VCCLCompilerTool"
					UsePrecompiledHeader="0"
				/>
			</FileConfiguration>

Insertion in crawl-ref/source/FixVec.h at line 17 [14.4566695]

[14.4567042]

[17.1285446]

#if _MSC_VER
// Benign: FixedVector has an array in member init list
# pragma warning(disable : 4351)
#endif

Deletion in crawl-ref/source/AppHdr.h at line 385 [14.4573713]
B:BD[14.4586428] → [14.4586428:4586429]
Replacement in crawl-ref/source/AppHdr.h at line 441 [14.4573713]
B:BD[14.4588370] → [14.4588370:4588377]
```
#endif
```
[14.4588370]
[14.4588377]
```
#endif /* MULTIUSER */
```
Insertion in crawl-ref/source/AppHdr.h at line 463 [14.4573713]
[14.4588976]
[14.4588976]
```
// And now headers we want precompiled
#include <externs.h>
```

Another batch of msvc compile fixes.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/tutorial.cc at line 11 [9.5936]

Insertion in crawl-ref/source/tutorial.cc at line 16 [9.5936]

Replacement in crawl-ref/source/tile2.cc at line 8 [12.13289]

Insertion in crawl-ref/source/tile2.cc at line 10 [12.13289]

Deletion in crawl-ref/source/tile2.cc at line 15 [12.13289]

Insertion in crawl-ref/source/tile1.cc at line 8 [12.96318]

Deletion in crawl-ref/source/tile1.cc at line 10 [12.96318]

Deletion in crawl-ref/source/tile1.cc at line 11 [12.96318]

Replacement in crawl-ref/source/tags.cc at line 1130 [14.164589]

Replacement in crawl-ref/source/tags.cc at line 1132 [14.164589]

Replacement in crawl-ref/source/tags.cc at line 1569 [14.164589]

Replacement in crawl-ref/source/tags.cc at line 1573 [14.164589]

Replacement in crawl-ref/source/religion.cc at line 3616 [14.804403]

Insertion in crawl-ref/source/notes.cc at line 9 [17.370339]

Deletion in crawl-ref/source/notes.cc at line 14 [17.370339]

Insertion in crawl-ref/source/msvc.h at line 1 [6.3632]

Deletion in crawl-ref/source/msvc.h at line 15 [6.3632]

Insertion in crawl-ref/source/msvc.h at line 16 [6.3632]

Replacement in crawl-ref/source/msvc.h at line 22 [6.3632]

Insertion in crawl-ref/source/msvc.h at line 31 [6.3632]

Replacement in crawl-ref/source/misc.cc at line 21 [14.1933596]

Replacement in crawl-ref/source/misc.cc at line 1843 [14.1933596]

Replacement in crawl-ref/source/misc.cc at line 1858 [14.1933596]

Insertion in crawl-ref/source/maps.cc at line 21 [14.2007666]

Insertion in crawl-ref/source/maps.cc at line 23 [14.2007666]

Insertion in crawl-ref/source/libw32c.cc at line 1 [14.2476860]

Deletion in crawl-ref/source/libw32c.cc at line 47 [14.2476860]

Insertion in crawl-ref/source/libw32c.cc at line 61 [14.2476860]

Insertion in crawl-ref/source/libw32c.cc at line 63 [14.2476860]

Deletion in crawl-ref/source/libw32c.cc at line 73 [14.2476860]

Replacement in crawl-ref/source/libw32c.cc at line 871 [14.2476860]

Insertion in crawl-ref/source/libw32c.cc at line 1042 [14.2476860]

Insertion in crawl-ref/source/libw32c.cc at line 1074 [14.2476860]

Replacement in crawl-ref/source/libutil.cc at line 398 [14.2494093]

Replacement in crawl-ref/source/initfile.cc at line 2546 [14.2957258]

Deletion in crawl-ref/source/hiscores.cc at line 34 [14.2987663]

Insertion in crawl-ref/source/hiscores.cc at line 36 [14.2987663]

Deletion in crawl-ref/source/hiscores.cc at line 66 [14.2987663]

Replacement in crawl-ref/source/hiscores.cc at line 1005 [14.2987663]

Replacement in crawl-ref/source/files.cc at line 55 [14.3084589]

Replacement in crawl-ref/source/files.cc at line 119 [14.3084589]

Insertion in crawl-ref/source/files.cc at line 339 [14.3084589]

Replacement in crawl-ref/source/dungeon.cc at line 1173 [14.3429798]

Replacement in crawl-ref/source/MSVC/crawl-ref.vcproj at line 23 [4.9337]

Replacement in crawl-ref/source/MSVC/crawl-ref.vcproj at line 48 [4.9337]

Replacement in crawl-ref/source/MSVC/crawl-ref.vcproj at line 123 [4.9337]

Insertion in crawl-ref/source/MSVC/crawl-ref.vcproj at line 195 [4.9337]

Insertion in crawl-ref/source/MSVC/crawl-ref.vcproj at line 275 [4.9337]

Deletion in crawl-ref/source/MSVC/crawl-ref.vcproj at line 434 [4.9337]

Deletion in crawl-ref/source/MSVC/crawl-ref.vcproj at line 437 [4.9337]

Deletion in crawl-ref/source/MSVC/crawl-ref.vcproj at line 506 [4.9337]

Insertion in crawl-ref/source/MSVC/crawl-ref.vcproj at line 519 [4.9337]

Deletion in crawl-ref/source/MSVC/crawl-ref.vcproj at line 538 [4.9337]

Deletion in crawl-ref/source/MSVC/crawl-ref.vcproj at line 541 [4.9337]

Insertion in crawl-ref/source/MSVC/crawl-ref.vcproj at line 683 [4.9337]

Insertion in crawl-ref/source/FixVec.h at line 17 [14.4566695]

Deletion in crawl-ref/source/AppHdr.h at line 385 [14.4573713]

Replacement in crawl-ref/source/AppHdr.h at line 441 [14.4573713]

Insertion in crawl-ref/source/AppHdr.h at line 463 [14.4573713]