JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* Makefile.in: Move CFLAGS and CXXFLAGS so that they can be manipulated by

Browse Source 
Makefile.common.  Add -static-libstdc++ to *LDFLAGS.  Add dependencies for
loadlib.h.
* loadlib.h: Update copyright.
(_load_sys_library): Properly define set_dll_library as WINAPI to avoid stack
corruption.
This commit is contained in:
Christopher Faylor
2012-11-28 03:22:36 +00:00
parent 66444a6b40
commit 29413f0630
3 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
winsup/utils/loadlib.h
View File

@ -1,6 +1,6 @@
/* loadlib.h
Copyright 2010, 2011 Red Hat, Inc.
Copyright 2010, 2011, 2012 Red Hat, Inc.
This file is part of Cygwin.
@ -23,7 +23,7 @@ static HMODULE _load_sys_library (const wchar_t *dll) __attribute__ ((used));
static HMODULE
_load_sys_library (const wchar_t *dll)
{
static BOOL (*set_dll_directory)(LPCWSTR);
static BOOL WINAPI (*set_dll_directory)(LPCWSTR);
static WCHAR sysdir[MAX_PATH];
static UINT sysdir_len;
@ -39,10 +39,10 @@ _load_sys_library (const wchar_t *dll)
{
HMODULE k32 = GetModuleHandleW (L"kernel32.dll");
if (k32)
set_dll_directory = (BOOL (*)(LPCWSTR))
set_dll_directory = (BOOL WINAPI (*)(LPCWSTR))
GetProcAddress (k32, "SetDllDirectoryW");
if (!set_dll_directory)
set_dll_directory = (BOOL (*)(LPCWSTR)) -1;
set_dll_directory = (BOOL WINAPI (*)(LPCWSTR)) -1;
else
set_dll_directory (L"");
}