Mercurial > ecos
changeset 2526:cb3aa3606536
Eliminate compiler warnings.
| author | bartv |
|---|---|
| date | Fri, 15 Aug 2008 16:50:45 +0000 |
| parents | 33cc410733a0 |
| children | 938a6182d15f |
| files | host/tools/configtool/ChangeLog host/tools/configtool/common/common/build.cxx host/tools/configtool/standalone/common/ChangeLog host/tools/configtool/standalone/common/cdl_exec.cxx host/tools/configtool/standalone/common/ecosconfig.cxx |
| diffstat | 5 files changed, 12 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/host/tools/configtool/ChangeLog +++ b/host/tools/configtool/ChangeLog @@ -1,3 +1,7 @@ +2008-08-15 Bart Veer <bartv@ecoscentric.com> + + * common/common/build.cxx: avoid compiler warning. + 2008-08-13 John Dallaway <jld@ecoscentric.com> * standalone/wxwin/configitem.cpp: Fix assert on ecDoubleEditorCtrl
--- a/host/tools/configtool/common/common/build.cxx +++ b/host/tools/configtool/common/common/build.cxx @@ -98,6 +98,7 @@ std::string replace_char (const std::str return output; } +#if defined(_WIN32) || defined(__CYGWIN__) // convert a filepath into a vector of path components static void path_to_vector (std::string input, std::vector <std::string> & output) { std::string component; @@ -116,7 +117,6 @@ static void path_to_vector (std::string // eliminate spaces from a DOS filepath by substituting the // short form of path components containing spaces -#if defined(_WIN32) || defined(__CYGWIN__) std::string nospace_path (const std::string input) { // split the path into a vector of path components std::vector <std::string> long_path_vector;
--- a/host/tools/configtool/standalone/common/ChangeLog +++ b/host/tools/configtool/standalone/common/ChangeLog @@ -1,3 +1,7 @@ +2008-08-15 Bart Veer <bartv@ecoscentric.com> + + * ecosconfig.cxx, cdl_exec.cxx: avoid compiler warnings. + 2006-07-10 Bart Veer <bartv@ecoscentric.com> * ecosconfig.cxx: add early C++ exception throw to work around
--- a/host/tools/configtool/standalone/common/cdl_exec.cxx +++ b/host/tools/configtool/standalone/common/cdl_exec.cxx @@ -44,6 +44,7 @@ #ifdef _MSC_VER #include <direct.h> /* for getcwd() */ #else +#include <limits.h> #include <unistd.h> /* for getcwd() */ #endif #ifdef __CYGWIN__
--- a/host/tools/configtool/standalone/common/ecosconfig.cxx +++ b/host/tools/configtool/standalone/common/ecosconfig.cxx @@ -42,6 +42,7 @@ //========================================================================== #ifndef _MSC_VER +#include <cstring> #include <sys/param.h> #include <unistd.h> /* for realpath() */ #endif @@ -55,7 +56,7 @@ #define TOOL_VERSION "2.net" #define TOOL_COPYRIGHT "Copyright (c) 2002 Red Hat, Inc.\nCopyright (c) 2004-2008 eCosCentric Limited" #define DEFAULT_SAVE_FILE "ecos.ecc" -static char* tool = "ecosconfig"; +static const char* tool = "ecosconfig"; int main (int argc, char * argv []) {
