diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2022-02-06 16:04:24 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2022-02-06 16:04:24 +0100 |
| commit | 5d2c2b27a6323e2666378b986129b2a7c2c39e5c (patch) | |
| tree | ce8982b6c0111f79791068de2c2d4c6ce3138a49 /app/bin/appdefaults.c | |
| parent | b623f5953691b2a0614e6f1f4def86bdbb9a4113 (diff) | |
New upstream version 5.2.2GAupstream/5.2.2GA
Diffstat (limited to 'app/bin/appdefaults.c')
| -rw-r--r-- | app/bin/appdefaults.c | 15 |
1 files changed, 3 insertions, 12 deletions
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; } |