mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r14069) -Fix: silence MSVC 64-bits compile warnings.

release/0.7
rubidium 2008-08-13 14:52:54 +00:00
parent e5bdcfaf9e
commit d986380169
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/fileio.cpp
View File

@ -367,12 +367,12 @@ FILE *FioFOpenFile(const char *filename, const char *mode, Subdirectory subdir,
strcpy(resolved_name, filename); strcpy(resolved_name, filename);
strtolower(resolved_name); strtolower(resolved_name);
uint resolved_len = strlen(resolved_name); size_t resolved_len = strlen(resolved_name);
/* Resolve ONE directory link */ /* Resolve ONE directory link */
for (TarLinkList::iterator link = _tar_linklist.begin(); link != _tar_linklist.end(); link++) { for (TarLinkList::iterator link = _tar_linklist.begin(); link != _tar_linklist.end(); link++) {
const std::string &src = link->first; const std::string &src = link->first;
uint len = src.length(); size_t len = src.length();
if (resolved_len >= len && resolved_name[len - 1] == PATHSEPCHAR && strncmp(src.c_str(), resolved_name, len) == 0) { if (resolved_len >= len && resolved_name[len - 1] == PATHSEPCHAR && strncmp(src.c_str(), resolved_name, len) == 0) {
/* Apply link */ /* Apply link */
char resolved_name2[MAX_RESOLVED_LENGTH]; char resolved_name2[MAX_RESOLVED_LENGTH];

2
src/misc_gui.cpp
View File

@ -1056,7 +1056,7 @@ enum QueryStringWidgets {
struct QueryStringWindow : public QueryStringBaseWindow struct QueryStringWindow : public QueryStringBaseWindow
{ {
QueryStringWindow(size_t size, const WindowDesc *desc, Window *parent) : QueryStringBaseWindow(size, desc) QueryStringWindow(uint16 size, const WindowDesc *desc, Window *parent) : QueryStringBaseWindow(size, desc)
{ {
this->parent = parent; this->parent = parent;
SetBit(_no_scroll, SCROLL_EDIT); SetBit(_no_scroll, SCROLL_EDIT);

4
src/querystring_gui.h
View File

@ -39,11 +39,11 @@ struct QueryString {
}; };
struct QueryStringBaseWindow : public Window, public QueryString { struct QueryStringBaseWindow : public Window, public QueryString {
const size_t edit_str_size;
char *edit_str_buf; char *edit_str_buf;
char *orig_str_buf; char *orig_str_buf;
const uint16 edit_str_size;
QueryStringBaseWindow(size_t size, const WindowDesc *desc, WindowNumber window_number = 0) : Window(desc, window_number), edit_str_size(size) QueryStringBaseWindow(uint16 size, const WindowDesc *desc, WindowNumber window_number = 0) : Window(desc, window_number), edit_str_size(size)
{ {
this->edit_str_buf = CallocT<char>(size); this->edit_str_buf = CallocT<char>(size);
} }