summaryrefslogtreecommitdiffstats
path: root/loader/elfdll.c
diff options
context:
space:
mode:
Diffstat (limited to 'loader/elfdll.c')
-rw-r--r--loader/elfdll.c30
1 files changed, 10 insertions, 20 deletions
diff --git a/loader/elfdll.c b/loader/elfdll.c
index b54dbce6e3..c393c4e294 100644
--- a/loader/elfdll.c
+++ b/loader/elfdll.c
@@ -3,16 +3,16 @@
*
* Copyright 1999 Bertho A. Stultiens
*/
-#include <config.h>
+#include "config.h"
#ifdef HAVE_LIBDL
-#include <wine/windef.h>
-#include <wine/module.h>
-#include <wine/heap.h>
-#include <wine/elfdll.h>
-#include <wine/debugtools.h>
-#include <wine/winerror.h>
+#include "wine/windef.h"
+#include "wine/module.h"
+#include "wine/heap.h"
+#include "wine/elfdll.h"
+#include "wine/debugtools.h"
+#include "wine/winerror.h"
//DEFAULT_DEBUG_CHANNEL(elfdll)
@@ -22,16 +22,6 @@
#include <ctype.h>
#include <dlfcn.h>
-struct modref_list_t;
-
-typedef struct modref_list_t
-{
- WINE_MODREF* wm;
- struct modref_list_t *next;
- struct modref_list_t *prev;
-}
-modref_list;
-
//WINE_MODREF *local_wm=NULL;
extern modref_list* local_wm;
@@ -202,7 +192,7 @@ static WINE_MODREF *ELFDLL_CreateModref(HMODULE hModule, LPCSTR path)
// wm->binfmt.pe.pe_resource = (PIMAGE_RESOURCE_DIRECTORY)RVA(hModule, dir->VirtualAddress);
- wm->filename = malloc(strlen(path)+1);
+ wm->filename = (char*) malloc(strlen(path)+1);
strcpy(wm->filename, path);
wm->modname = strrchr( wm->filename, '\\' );
if (!wm->modname) wm->modname = wm->filename;
@@ -221,7 +211,7 @@ static WINE_MODREF *ELFDLL_CreateModref(HMODULE hModule, LPCSTR path)
if(local_wm)
{
- local_wm->next=malloc(sizeof(modref_list));
+ local_wm->next = (modref_list*) malloc(sizeof(modref_list));
local_wm->next->prev=local_wm;
local_wm->next->next=NULL;
local_wm->next->wm=wm;
@@ -229,7 +219,7 @@ static WINE_MODREF *ELFDLL_CreateModref(HMODULE hModule, LPCSTR path)
}
else
{
- local_wm=malloc(sizeof(modref_list));
+ local_wm = (modref_list*) malloc(sizeof(modref_list));
local_wm->next=local_wm->prev=NULL;
local_wm->wm=wm;
}