aboutsummaryrefslogtreecommitdiff
path: root/gui
diff options
context:
space:
mode:
authorMax Horn2004-09-28 11:29:32 +0000
committerMax Horn2004-09-28 11:29:32 +0000
commit4fed56e8a6bbbd193e12c437bd0f262c174c7a89 (patch)
treeb3aa50b0ea1f3e59c33fb9f26f78eff5c07328be /gui
parentae73d1a4ee373f8c94291dc79f090c991dc021e4 (diff)
downloadscummvm-rg350-4fed56e8a6bbbd193e12c437bd0f262c174c7a89.tar.gz
scummvm-rg350-4fed56e8a6bbbd193e12c437bd0f262c174c7a89.tar.bz2
scummvm-rg350-4fed56e8a6bbbd193e12c437bd0f262c174c7a89.zip
including sys/param.h causes several conflicts with symbol names we use, so don't do it
svn-id: r15320
Diffstat (limited to 'gui')
-rw-r--r--gui/options.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/gui/options.cpp b/gui/options.cpp
index 6cd4b8d461..7e2eb2e2aa 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -33,9 +33,14 @@
#include "sound/mididrv.h"
#if (!( defined(__DC__) || defined(__GP32__)) && !defined(_MSC_VER))
+#include <sys/param.h>
#include <unistd.h>
#endif
+#if !(defined(MAXPATHLEN))
+#define MAXPATHLEN 1024
+#endif
+
namespace GUI {
// TODO - allow changing options for:
@@ -427,9 +432,6 @@ void GlobalOptionsDialog::open() {
_savePath->setLabel(dir);
} else {
// Default to the current directory...
-#if !(defined(MAXPATHLEN))
-#define MAXPATHLEN 1024
-#endif
char buf[MAXPATHLEN];
getcwd(buf, sizeof(buf));
_savePath->setLabel(buf);