[Scummvm-cvs-logs] CVS: scummvm/gui options.cpp,1.57,1.58

[Max Horn]

Update of /cvsroot/scummvm/scummvm/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14046/gui

Modified Files:
	options.cpp 
Log Message:
including sys/param.h causes several conflicts with symbol names we use, so don't do it

Index: options.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/options.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- options.cpp	28 Sep 2004 04:14:57 -0000	1.57
+++ options.cpp	28 Sep 2004 11:29:32 -0000	1.58
@@ -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 @@
 		_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);