aboutsummaryrefslogtreecommitdiff
path: root/backends
diff options
context:
space:
mode:
authorMax Horn2007-03-08 16:53:30 +0000
committerMax Horn2007-03-08 16:53:30 +0000
commit273480d49253cc5a353a76a46da635aaeb779b8c (patch)
treefef4ede6ee78c432532f179cd97b4d7ab2ba42c3 /backends
parent89095f10a803032cc5aeda96e55b6ecfdd7cd679 (diff)
downloadscummvm-rg350-273480d49253cc5a353a76a46da635aaeb779b8c.tar.gz
scummvm-rg350-273480d49253cc5a353a76a46da635aaeb779b8c.tar.bz2
scummvm-rg350-273480d49253cc5a353a76a46da635aaeb779b8c.zip
Removed MAX_FILENAME_LENGTH workaround (using enum's instead of #defines means we can take advantage of namespaces)
svn-id: r26019
Diffstat (limited to 'backends')
-rw-r--r--backends/fs/ds/ds-fs.h12
-rw-r--r--backends/platform/ds/arm9/source/fat/gba_nds_fat.h4
2 files changed, 9 insertions, 7 deletions
diff --git a/backends/fs/ds/ds-fs.h b/backends/fs/ds/ds-fs.h
index 5b9bd84a0d..56642bb45d 100644
--- a/backends/fs/ds/ds-fs.h
+++ b/backends/fs/ds/ds-fs.h
@@ -34,12 +34,11 @@
#include "backends/fs/abstract-fs.h"
//#include "backends/fs/fs.h"
-// Fix name clash with FOTAQ engine, cutaway.h
-#undef MAX_FILENAME_LENGTH
-// This class is used when a Flash cart is in use
-
namespace DS {
+/**
+ * This class is used when a Flash cart is in use.
+ */
class DSFileSystemNode : public AbstractFilesystemNode {
protected:
static ZipFile* _zipFile;
@@ -72,8 +71,9 @@ public:
};
-// This class is used when the GBAMP (GBA Movie Player) is used with a CompactFlash card
-
+/**
+ * This class is used when the GBAMP (GBA Movie Player) is used with a CompactFlash card.
+ */
class GBAMPFileSystemNode : public AbstractFilesystemNode {
protected:
typedef class Common::String String;
diff --git a/backends/platform/ds/arm9/source/fat/gba_nds_fat.h b/backends/platform/ds/arm9/source/fat/gba_nds_fat.h
index 5020cd1b49..b238182e14 100644
--- a/backends/platform/ds/arm9/source/fat/gba_nds_fat.h
+++ b/backends/platform/ds/arm9/source/fat/gba_nds_fat.h
@@ -66,7 +66,9 @@ extern "C" {
// Important constants
-#define MAX_FILENAME_LENGTH 256 // Maximum LFN length. Don't change this one
+enum {
+ MAX_FILENAME_LENGTH = 256 // Maximum LFN length. Don't change this one
+};
// File Constants
#ifndef EOF