Commit ee78f1e7 authored by Peter Eastman's avatar Peter Eastman
Browse files

Fixed compilation errors on Windows

parent 0644bdd0
...@@ -35,17 +35,17 @@ using namespace OpenMM; ...@@ -35,17 +35,17 @@ using namespace OpenMM;
#if defined(WIN32) #if defined(WIN32)
#include <windows.h> #include <windows.h>
extern "C" void registerAmoebaSerializationProxies(); extern "C" void registerKernelFactories();
BOOL WINAPI DllMain(HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) { BOOL WINAPI DllMain(HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) {
if (ul_reason_for_call == DLL_PROCESS_ATTACH) if (ul_reason_for_call == DLL_PROCESS_ATTACH)
registerAmoebaSerializationProxies(); registerKernelFactories();
return TRUE; return TRUE;
} }
#else #else
extern "C" void __attribute__((constructor)) registerKernelFactories(); extern "C" void __attribute__((constructor)) registerKernelFactories();
#endif #endif
extern "C" void OPENMM_EXPORT registerKernelFactories() { extern "C" void registerKernelFactories() {
for( int ii = 0; ii < Platform::getNumPlatforms(); ii++ ){ for( int ii = 0; ii < Platform::getNumPlatforms(); ii++ ){
Platform& platform = Platform::getPlatform(ii); Platform& platform = Platform::getPlatform(ii);
if( platform.getName() == "Reference" ){ if( platform.getName() == "Reference" ){
......
...@@ -38,10 +38,10 @@ using namespace OpenMM; ...@@ -38,10 +38,10 @@ using namespace OpenMM;
#if defined(WIN32) #if defined(WIN32)
#include <windows.h> #include <windows.h>
extern "C" void registerAmoebaSerializationProxies(); extern "C" void registerKernelFactories();
BOOL WINAPI DllMain(HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) { BOOL WINAPI DllMain(HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) {
if (ul_reason_for_call == DLL_PROCESS_ATTACH) if (ul_reason_for_call == DLL_PROCESS_ATTACH)
registerAmoebaSerializationProxies(); registerKernelFactories();
return TRUE; return TRUE;
} }
#else #else
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment