X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=args.h;h=2bc0211236218c84e057345910aacc90c9eecb94;hb=ce2d2972671ea7eff9dbbe7028718bef4d837dfb;hp=48371adb6427fecabb5218ef72f6bad8e55de501;hpb=0a8f96e95c703feb86bb9770442d6842e3d67248;p=xboard.git

diff --git a/args.h b/args.h
index 48371ad..2bc0211 100644
--- a/args.h
+++ b/args.h
@@ -5,7 +5,7 @@
  * Massachusetts.
  *
  * Enhancements Copyright 1992-2001, 2002, 2003, 2004, 2005, 2006,
- * 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
+ * 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
  *
  * Enhancements Copyright 2005 Alessandro Scotti
  *
@@ -699,6 +699,7 @@ ArgDescriptor argDescriptors[] = {
   { "buttonColor", ArgString, (void *) &appData.buttonColor, XBOARD, (ArgIniType) "" },
   { "firstDrawDepth", ArgInt, (void *) &appData.drawDepth[0], FALSE, (ArgIniType) 0 },
   { "secondDrawDepth", ArgInt, (void *) &appData.drawDepth[1], FALSE, (ArgIniType) 0 },
+  { "memoHeaders", ArgBoolean, (void *) &appData.headers, TRUE, (ArgIniType) FALSE },
 
 #if ZIPPY
   { "zippyTalk", ArgBoolean, (void *) &appData.zippyTalk, FALSE, (ArgIniType) ZIPPY_TALK },
@@ -911,7 +912,9 @@ ParseSettingsFile(char *name, char **addr)
     f = fopen(fullname, "r");
 #ifdef DATADIR
     if(f == NULL && *fullname != '/') {         // when a relative name did not work
-	MySearchPath(DATADIR "/themes/conf", name, fullname); // also look in standard place
+	char buf[MSG_SIZ];
+	snprintf(buf, MSG_SIZ, "%s/themes/conf", DATADIR);
+	MySearchPath(buf, name, fullname); // also look in standard place
 	f = fopen(fullname, "r");
     }
 #endif
@@ -1147,14 +1150,12 @@ ParseArgs(GetFunc get, void *cl)
 
     case ArgString:
     case ArgFilename:
-#ifdef DATADIR
       if(argValue[0] == '~' && argValue[1] == '~') {
         char buf[4*MSG_SIZ]; // expand ~~
-        snprintf(buf, 4*MSG_SIZ, DATADIR "%s", argValue+2);
+        snprintf(buf, 4*MSG_SIZ, "%s%s", DATADIR, argValue+2);
         ASSIGN(*(char **) ad->argLoc, buf);
         break;
       }
-#endif
       ASSIGN(*(char **) ad->argLoc, argValue);
       break;