6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-08-17 21:29:20 +00:00
Code Issues Projects Releases Wiki Activity

Cast the void* handle data member to HMODULE* to keep the VC++ compiler

Browse Source 
happy. Thanks to Henrik Bach for pointing this out.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@18056 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Reid Spencer 2004-11-20 23:30:55 +00:00
parent b95cbee930
commit 7a4538941a
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/System/Win32/DynamicLibrary.cpp
View File

@ -12,6 +12,7 @@
//===----------------------------------------------------------------------===//
#include "Win32.h"
#include <windef.h>
namespace llvm {
using namespace sys;
@ -22,9 +23,10 @@ using namespace sys;
//===----------------------------------------------------------------------===//
DynamicLibrary::DynamicLibrary(const char*filename) : handle(0) {
handle = LoadLibrary(filename);
handle = new HMODULE;
*((HMODULE*)handle) = LoadLibrary(filename);
if (handle == 0) {
if (*((HMODULE*)handle) == 0) {
char Buffer[100];
// FIXME: This should use FormatMessage
sprintf(Buffer, "Windows error code %d\n", GetLastError());
@ -33,13 +35,15 @@ DynamicLibrary::DynamicLibrary(const char*filename) : handle(0) {
}
DynamicLibrary::~DynamicLibrary() {
if (handle)
FreeLibrary(handle);
assert(handle !=0 && "Invalid DynamicLibrary handle");
if (*((HMODULE*)handle))
FreeLibrary(*((HMODULE*)handle));
delete (HMODULE*)handle;
}
void *DynamicLibrary::GetAddressOfSymbol(const char *symbolName) {
assert(handle !=0 && "Invalid DynamicLibrary handle");
return GetProcAddress(handle, symbolName);
return (void*) GetProcAddress(*((HMODULE*)handle), symbolName);
}
}

14
lib/System/Win32/DynamicLibrary.inc
View File

@ -12,6 +12,7 @@
//===----------------------------------------------------------------------===//
#include "Win32.h"
#include <windef.h>
namespace llvm {
using namespace sys;
@ -22,9 +23,10 @@ using namespace sys;
//===----------------------------------------------------------------------===//
DynamicLibrary::DynamicLibrary(const char*filename) : handle(0) {
handle = LoadLibrary(filename);
handle = new HMODULE;
*((HMODULE*)handle) = LoadLibrary(filename);
if (handle == 0) {
if (*((HMODULE*)handle) == 0) {
char Buffer[100];
// FIXME: This should use FormatMessage
sprintf(Buffer, "Windows error code %d\n", GetLastError());
@ -33,13 +35,15 @@ DynamicLibrary::DynamicLibrary(const char*filename) : handle(0) {
}
DynamicLibrary::~DynamicLibrary() {
if (handle)
FreeLibrary(handle);
assert(handle !=0 && "Invalid DynamicLibrary handle");
if (*((HMODULE*)handle))
FreeLibrary(*((HMODULE*)handle));
delete (HMODULE*)handle;
}
void *DynamicLibrary::GetAddressOfSymbol(const char *symbolName) {
assert(handle !=0 && "Invalid DynamicLibrary handle");
return GetProcAddress(handle, symbolName);
return (void*) GetProcAddress(*((HMODULE*)handle), symbolName);
}
}