Skip to content

Commit e284f6c

Browse files
[[ cpptest ]] Fix windows compile errors
Adding `GTEST_HAS_EXCEPTIONS=0` doesn't actually fix any error but should probably be set as LiveCode doesn't use exceptions.
1 parent 4aa63f4 commit e284f6c

2 files changed

Lines changed: 2 additions & 7 deletions

File tree

engine/src/sysdefs.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -262,13 +262,6 @@ typedef struct __MCWinSysIconHandle *MCWinSysIconHandle;
262262
typedef struct __MCWinSysMetafileHandle *MCWinSysMetafileHandle;
263263
typedef struct __MCWinSysEnhMetafileHandle *MCWinSysEnhMetafileHandle;
264264

265-
#define PLACEMENT_NEW_DEFINED
266-
#define __PLACEMENT_NEW_INLINE
267-
inline void *operator new (size_t size, void *p)
268-
{
269-
return p;
270-
}
271-
272265
#if defined(_DEBUG)
273266

274267
#include <crtdbg.h>

libcpptest/libcpptest.gyp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
'GTEST_HAS_POSIX_RE=0',
3939
'GTEST_HAS_PTHREAD=0',
4040
'GTEST_HAS_RTTI=0',
41+
'GTEST_HAS_EXCEPTIONS=0',
4142
],
4243

4344
'all_dependent_settings':
@@ -47,6 +48,7 @@
4748
'GTEST_HAS_POSIX_RE=0',
4849
'GTEST_HAS_PTHREAD=0',
4950
'GTEST_HAS_RTTI=0',
51+
'GTEST_HAS_EXCEPTIONS=0',
5052
],
5153

5254
'include_dirs':

0 commit comments

Comments
 (0)