haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compil on msys2 (Structured Exception Handling not really supported)

This commit is contained in:
jean-pierre charras 2023-02-05 10:39:25 +01:00
parent 525d0da126
commit 23d0e6b4c0
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/gal/opengl/cached_container.cpp
View File

@ -282,7 +282,12 @@ void CACHED_CONTAINER::defragment( VERTEX* aTarget )
[&]() [&]()
{ {
#ifdef __WIN32__ #ifdef __WIN32__
#ifdef __MINGW32__
// currently, because SEH (Structured Exception Handling) is not documented on msys
// (for intance __try or __try1 exists without doc) or is not supported, do nothing
#else
__try __try
#endif
#endif #endif
{ {
for( VERTEX_ITEM* item : m_items ) for( VERTEX_ITEM* item : m_items )
@ -310,6 +315,10 @@ void CACHED_CONTAINER::defragment( VERTEX* aTarget )
} }
} }
#ifdef __WIN32__ #ifdef __WIN32__
#ifdef __MINGW32__
// currently, because SEH (Structured Exception Handling) is not documented on msys
// (for intance __except1 exists without doc) or is not supported, do nothing
#else
__except( GetExceptionCode() == STATUS_ACCESS_VIOLATION ? EXCEPTION_EXECUTE_HANDLER __except( GetExceptionCode() == STATUS_ACCESS_VIOLATION ? EXCEPTION_EXECUTE_HANDLER
: EXCEPTION_CONTINUE_SEARCH ) : EXCEPTION_CONTINUE_SEARCH )
{ {
@ -318,6 +327,7 @@ void CACHED_CONTAINER::defragment( VERTEX* aTarget )
"system or GPU memory running low." ); "system or GPU memory running low." );
}; };
#endif #endif
#endif
}(); }();
m_maxIndex = usedSpace(); m_maxIndex = usedSpace();