diff options
| author | rubidium <rubidium@openttd.org> | 2008-08-13 14:52:54 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2008-08-13 14:52:54 +0000 |
| commit | a7d3d86f55d7256e05d2a8d554244af7e3949cb3 (patch) | |
| tree | 56706d0f0533ca69053176299e8a127b376cf428 | |
| parent | 8e8fabd27c1d3243b3524ed31d4b30787b8664d8 (diff) | |
| download | openttd-a7d3d86f55d7256e05d2a8d554244af7e3949cb3.tar.xz | |
(svn r14069) -Fix: silence MSVC 64-bits compile warnings.
| -rw-r--r-- | src/fileio.cpp | 4 | ||||
| -rw-r--r-- | src/misc_gui.cpp | 2 | ||||
| -rw-r--r-- | src/querystring_gui.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/fileio.cpp b/src/fileio.cpp index c1dafab91..8201b7c0f 100644 --- a/src/fileio.cpp +++ b/src/fileio.cpp @@ -367,12 +367,12 @@ FILE *FioFOpenFile(const char *filename, const char *mode, Subdirectory subdir, strcpy(resolved_name, filename); strtolower(resolved_name); - uint resolved_len = strlen(resolved_name); + size_t resolved_len = strlen(resolved_name); /* Resolve ONE directory link */ for (TarLinkList::iterator link = _tar_linklist.begin(); link != _tar_linklist.end(); link++) { 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) { /* Apply link */ char resolved_name2[MAX_RESOLVED_LENGTH]; diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp index 7086e2d32..602c06602 100644 --- a/src/misc_gui.cpp +++ b/src/misc_gui.cpp @@ -1056,7 +1056,7 @@ enum QueryStringWidgets { 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; SetBit(_no_scroll, SCROLL_EDIT); diff --git a/src/querystring_gui.h b/src/querystring_gui.h index 40b0c8685..05a25c42a 100644 --- a/src/querystring_gui.h +++ b/src/querystring_gui.h @@ -39,11 +39,11 @@ struct QueryString { }; struct QueryStringBaseWindow : public Window, public QueryString { - const size_t edit_str_size; char *edit_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); } |