[Scummvm-cvs-logs] CVS: scummvm/common config-manager.cpp,1.24,1.24.2.1 stdafx.h,1.19,1.19.2.1

Jonathan Gray khalek at users.sourceforge.net
Sat Dec 18 04:08:04 CET 2004


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

Modified Files:
      Tag: release-0-7-0
	config-manager.cpp stdafx.h 
Log Message:
Default *nix save path for 0.7.0 as well.


Index: config-manager.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/config-manager.cpp,v
retrieving revision 1.24
retrieving revision 1.24.2.1
diff -u -d -r1.24 -r1.24.2.1
--- config-manager.cpp	5 Dec 2004 23:24:43 -0000	1.24
+++ config-manager.cpp	18 Dec 2004 12:07:45 -0000	1.24.2.1
@@ -25,7 +25,6 @@
 #include "common/config-manager.h"
 
 #if defined(UNIX)
-#include <sys/param.h>
 #ifdef MACOSX
 #define DEFAULT_CONFIG_FILE "Library/Preferences/ScummVM Preferences"
 #else
@@ -35,10 +34,6 @@
 #define DEFAULT_CONFIG_FILE "scummvm.ini"
 #endif
 
-#ifndef MAXPATHLEN
-#define MAXPATHLEN 256
-#endif
-
 #define MAXLINELEN 256
 
 static char *ltrim(char *t) {

Index: stdafx.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/stdafx.h,v
retrieving revision 1.19
retrieving revision 1.19.2.1
diff -u -d -r1.19 -r1.19.2.1
--- stdafx.h	28 Sep 2004 12:11:00 -0000	1.19
+++ stdafx.h	18 Dec 2004 12:07:45 -0000	1.19.2.1
@@ -99,6 +99,7 @@
 #if !defined(macintosh)
 #include <sys/types.h>
 #include <sys/uio.h>
+#include <sys/param.h>
 #endif
 #if !defined (__BEOS__)
 #include <unistd.h>
@@ -119,4 +120,8 @@
 
 #endif
 
+#ifndef MAXPATHLEN
+#define MAXPATHLEN 256
+#endif
+
 #endif





More information about the Scummvm-git-logs mailing list