stdcall and declspec(dllexport) don't play nicely together

Change-Id: I56da76771790cb6824ac3d01072d9143cb580741
This commit is contained in:
Peter Foley
2013-02-11 16:53:30 -05:00
parent bbe6f3f59b
commit 33b838a449
4 changed files with 10 additions and 2 deletions

View File

@@ -13,6 +13,10 @@ $(eval $(call gb_Library_add_defs,sellangmsi,\
-D_STLP_USE_STATIC_LIB \
))
$(eval $(call gb_Library_add_ldflags,sellangmsi,\
/DEF:$(SRCDIR)/setup_native/source/win32/customactions/sellang/sellang.def \
))
$(eval $(call gb_Library_add_exception_objects,sellangmsi,\
setup_native/source/win32/customactions/sellang/sellang \
setup_native/source/win32/customactions/sellang/sorttree \

View File

@@ -232,7 +232,7 @@ void addMatchingDictionaries(
}
extern "C" __declspec(dllexport) UINT __stdcall SelectLanguage( MSIHANDLE handle )
extern "C" UINT __stdcall SelectLanguage( MSIHANDLE handle )
{
char feature[100];
MSIHANDLE database, view, record;

View File

@@ -0,0 +1,4 @@
LIBRARY "sellangmsi.dll"
EXPORTS
SelectLanguage
SortTree

View File

@@ -18,7 +18,7 @@
#pragma warning(pop)
#endif
extern "C" __declspec(dllexport) UINT __stdcall SortTree(MSIHANDLE)
extern "C" UINT __stdcall SortTree(MSIHANDLE)
{
// Sort items (languages) in SelectionTree control, fdo#46355