From 5d2c2b27a6323e2666378b986129b2a7c2c39e5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Sun, 6 Feb 2022 16:04:24 +0100
Subject: New upstream version 5.2.2GA

---
 app/bin/appdefaults.c | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

(limited to 'app/bin/appdefaults.c')

diff --git a/app/bin/appdefaults.c b/app/bin/appdefaults.c
index 55a2201..e5cff8b 100644
--- a/app/bin/appdefaults.c
+++ b/app/bin/appdefaults.c
@@ -20,22 +20,12 @@
 *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include <locale.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <string.h>
 #include <wchar.h>
 
-#ifdef WINDOWS
-#include <Windows.h>
-#include <malloc.h>
-#endif
-
 #include "common.h"
 #include "custom.h"
 #include "fileio.h"
 #include "paths.h"
-#include "wlib.h"
 
 enum defaultTypes {
     INTEGERCONSTANT,
@@ -114,7 +104,7 @@ struct appDefault xtcDefaults[] = {
     { "misc.scale", 0, STRINGFUNCTION, { .stringFunction = GetLocalPopularScale}},				/**< the (probably) most popular scale for a region */
 };
 
-#define DEFAULTCOUNT (sizeof(xtcDefaults)/sizeof(xtcDefaults[0]))
+#define DEFAULTCOUNT COUNT(xtcDefaults)
 
 
 static long bFirstRun;						/**< TRUE if appl is run the first time */
@@ -203,6 +193,7 @@ InitializeRegionCode(void)
 {
     strcpy(regionCode, "US");
 
+// TODO Move this to wlib
 #ifdef WINDOWS
     {
         LCID lcid;
@@ -301,7 +292,7 @@ static char *
 GetParamFullPath(struct appDefault *ptrDefault, void *additionalData)
 {
     char *str;
-    MakeFullpath(&str, libDir, PARAM_SUBDIR, (char*)additionalData, (void *)0);
+    MakeFullpath(&str, libDir, PARAM_SUBDIR, (char*)additionalData, I2VP(0));
     return str;
 }
 
-- 
cgit v1.2.3