diff options
author | Jonathan Gray | 2003-08-21 13:39:21 +0000 |
---|---|---|
committer | Jonathan Gray | 2003-08-21 13:39:21 +0000 |
commit | ce42f4d3dd461ced69470ea70e4f840c8abfb246 (patch) | |
tree | 2cb607f30318011bcd8c5f52e20f04d88400d1b4 /common | |
parent | 255c7ae5ff8c8f526de349246cdaf73506a85e81 (diff) | |
download | scummvm-rg350-ce42f4d3dd461ced69470ea70e4f840c8abfb246.tar.gz scummvm-rg350-ce42f4d3dd461ced69470ea70e4f840c8abfb246.tar.bz2 scummvm-rg350-ce42f4d3dd461ced69470ea70e4f840c8abfb246.zip |
patch #791738 g++ 3.4 compile fix, from Falk Hueffner and a few minor local bits in my tree
svn-id: r9807
Diffstat (limited to 'common')
-rw-r--r-- | common/file.cpp | 3 | ||||
-rw-r--r-- | common/list.h | 2 | ||||
-rw-r--r-- | common/map.h | 2 | ||||
-rw-r--r-- | common/rect.h | 2 | ||||
-rw-r--r-- | common/str.cpp | 2 | ||||
-rw-r--r-- | common/str.h | 2 |
6 files changed, 7 insertions, 6 deletions
diff --git a/common/file.cpp b/common/file.cpp index e99ef2b8cf..78667f0c9a 100644 --- a/common/file.cpp +++ b/common/file.cpp @@ -25,9 +25,10 @@ FILE *File::fopenNoCase(const char *filename, const char *directory, const char *mode) { FILE *file; - char buf[256]; + char buf[512]; char *ptr; + assert(directory); strcpy(buf, directory); #ifdef WIN32 diff --git a/common/list.h b/common/list.h index 213b77ccb9..4421981628 100644 --- a/common/list.h +++ b/common/list.h @@ -126,6 +126,6 @@ protected: } }; -};// End of namespace ScummVM +} // End of namespace ScummVM #endif diff --git a/common/map.h b/common/map.h index 8098afa1bd..e4b3099573 100644 --- a/common/map.h +++ b/common/map.h @@ -237,6 +237,6 @@ class String; typedef Map<String, String> StringMap; -}; // End of namespace ScummVM +} // End of namespace ScummVM #endif diff --git a/common/rect.h b/common/rect.h index c5a62cab22..a4820a3722 100644 --- a/common/rect.h +++ b/common/rect.h @@ -108,6 +108,6 @@ struct Rect { } }; -}; // End of namespace ScummVM +} // End of namespace ScummVM #endif diff --git a/common/str.cpp b/common/str.cpp index 526841c58f..99b1766352 100644 --- a/common/str.cpp +++ b/common/str.cpp @@ -266,4 +266,4 @@ bool operator != (const char* y, const ConstString &x) { return x != y; } -}; // End of namespace ScummVM +} // End of namespace ScummVM diff --git a/common/str.h b/common/str.h index 955f5ab7f1..e134557dc7 100644 --- a/common/str.h +++ b/common/str.h @@ -141,6 +141,6 @@ public: } }; -}; // End of namespace ScummVM +} // End of namespace ScummVM #endif |