diff loader/module.c @ 1307:d8c1b0b38edc

Add prototypes to wine/loader stuff, so that we can catch __stdcall function attribute mismatch between caller/caller. wine/loader is less sensitive to optimization now. (now that avifile-0.6 has the same patch installed, we're a bit closer to their CVS tree) Speed up win32 "QueryPerformanceFrequency" emulation on solaris.
author jkeil
date Thu, 12 Jul 2001 15:27:48 +0000
parents 28091b3caff9
children ce45cce7f7a5
line wrap: on
line diff
--- a/loader/module.c	Thu Jul 12 15:23:26 2001 +0000
+++ b/loader/module.c	Thu Jul 12 15:27:48 2001 +0000
@@ -15,6 +15,11 @@
 
 #include <sys/mman.h>
 #include <sys/types.h>
+#ifdef HAVE_LIBDL
+#include <wine/elfdll.h>
+#include <dlfcn.h>
+#endif
+
 /*
 #ifdef __linux__
 #include <asm/unistd.h>
@@ -48,6 +53,7 @@
 #include <wine/module.h>
 #include <wine/pe_image.h>
 #include <wine/debugtools.h>
+#include "win32.h"
 
 struct modref_list_t;
 
@@ -79,7 +85,7 @@
     return list->wm;
 }    
 
-void MODULE_RemoveFromList(WINE_MODREF *mod)
+static void MODULE_RemoveFromList(WINE_MODREF *mod)
 {
     modref_list* list=local_wm;
     if(list==0)
@@ -478,7 +484,7 @@
 	return retproc;
 #ifdef HAVE_LIBDL	
     case MODULE32_ELF:
-	retproc = (FARPROC) dlsym( wm->module, function);
+	retproc = (FARPROC) dlsym( (void*)wm->module, function);
 	if (!retproc) SetLastError(ERROR_PROC_NOT_FOUND);
 	return retproc;
 #endif