Tweaks to get it to build on win32.

This commit is contained in:
John Popplewell 2007-08-13 06:38:03 +00:00
parent 429bcabc8e
commit 1adf3f4f78

View file

@ -6005,7 +6005,7 @@ static void setup(int argc, char *argv[])
/* Windows */ /* Windows */
savedir = GetDefaultSaveDir("TuxPaint"); savedir = GetDefaultSaveDir("TuxPaint");
datadir = GetDefaultDataDir("TuxPaint"); datadir = GetDefaultSaveDir("TuxPaint");
#elif __BEOS__ #elif __BEOS__
/* BeOS */ /* BeOS */
@ -6615,7 +6615,7 @@ static void setup(int argc, char *argv[])
#ifndef WIN32 #ifndef WIN32
lock_fname = get_fname("lockfile.dat", DIR_SAVE); lock_fname = get_fname("lockfile.dat", DIR_SAVE);
#else #else
lock_fname = get_temp_fname("lockfile.dat", DIR_SAVE); lock_fname = get_temp_fname("lockfile.dat");
#endif #endif
fi = fopen(lock_fname, "r"); fi = fopen(lock_fname, "r");
@ -11728,7 +11728,7 @@ static void cleanup(void)
#ifndef WIN32 #ifndef WIN32
lock_fname = get_fname("lockfile.dat", DIR_SAVE); lock_fname = get_fname("lockfile.dat", DIR_SAVE);
#else #else
lock_fname = get_temp_fname("lockfile.dat", DIR_SAVE); lock_fname = get_temp_fname("lockfile.dat");
#endif #endif
zero_time = (time_t) 0; zero_time = (time_t) 0;
@ -16824,6 +16824,8 @@ void load_magic_plugins(void)
#endif #endif
} }
int magic_sort(const void * a, const void * b) int magic_sort(const void * a, const void * b)
{ {
magic_t * am = (magic_t *) a; magic_t * am = (magic_t *) a;