summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Howard2013-03-31 19:09:45 +0000
committerSimon Howard2013-03-31 19:09:45 +0000
commitfdd021c5650584421751a91b81a98ed6dbc9ef2f (patch)
tree80bd3ad328055894d4b5a6fff660493e6235ace3
parent3ac144025a055a3b85c1f4b2ef05b6f2892788f5 (diff)
downloadchocolate-doom-fdd021c5650584421751a91b81a98ed6dbc9ef2f.tar.gz
chocolate-doom-fdd021c5650584421751a91b81a98ed6dbc9ef2f.tar.bz2
chocolate-doom-fdd021c5650584421751a91b81a98ed6dbc9ef2f.zip
Fix file selector issues with Windows build.
Subversion-branch: /trunk/chocolate-doom Subversion-revision: 2571
-rw-r--r--textscreen/txt_fileselect.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/textscreen/txt_fileselect.c b/textscreen/txt_fileselect.c
index e0e7505b..5cc53aad 100644
--- a/textscreen/txt_fileselect.c
+++ b/textscreen/txt_fileselect.c
@@ -149,8 +149,8 @@ static char *ExecReadOutput(char **argv)
#include <shlobj.h>
static BOOL WINAPI (*MyGetOpenFileName)(LPOPENFILENAME) = NULL;
-static PIDLIST_ABSOLUTE (*MySHBrowseForFolder)(LPBROWSEINFO) = NULL;
-static BOOL (*MySHGetPathFromIDList)(PCIDLIST_ABSOLUTE, LPTSTR) = NULL;
+static LPITEMIDLIST (*MySHBrowseForFolder)(LPBROWSEINFO) = NULL;
+static BOOL (*MySHGetPathFromIDList)(LPITEMIDLIST, LPTSTR) = NULL;
// Load library functions from DLL files.
@@ -176,7 +176,7 @@ static int LoadDLLs(void)
&& MySHGetPathFromIDList != NULL;
}
-static InitLibraries(void)
+static int InitLibraries(void)
{
static int initted = 0, success = 0;
@@ -233,7 +233,6 @@ static char *SelectDirectory(char *window_title)
{
LPITEMIDLIST pidl;
BROWSEINFO bi;
- LPMALLOC allocator;
char selected[MAX_PATH] = "";
char *result;