diff options
| author | Lode Vandevenne <lvandeve@users.noreply.github.com> | 2019-11-12 21:54:04 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-12 21:54:04 +0300 |
| commit | 4d4a4068c00afdc23ec4240d645df66296a9bb1a (patch) | |
| tree | 124952309ec72a5c3335d31eac02132f696e3bef | |
| parent | 49ffb08e3a370406bddbbfe0486b337334f34a22 (diff) | |
| parent | af64c9331e53cbc3c505b2c8c15666532e369004 (diff) | |
Merge pull request #119 from sezero/wcc
do not define LODEPNG_RESTRICT Open Watcom in C++ mode.
| -rw-r--r-- | lodepng.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lodepng.cpp b/lodepng.cpp index eeb16c6..ab35ce4 100644 --- a/lodepng.cpp +++ b/lodepng.cpp @@ -105,7 +105,8 @@ void lodepng_free(void* ptr); /* restrict is not available in C90, but use it when supported by the compiler */ #if (defined(__GNUC__) && defined(__GNUC_MINOR__) && (__GNUC__ >= 3) && (__GNUC_MINOR__ >= 1)) ||\ - (defined(_MSC_VER) && (_MSC_VER >= 1400)) || (defined(__WATCOMC__) && (__WATCOMC__ >= 1250)) + (defined(_MSC_VER) && (_MSC_VER >= 1400)) || \ + (defined(__WATCOMC__) && (__WATCOMC__ >= 1250) && !defined(__cplusplus)) #define LODEPNG_RESTRICT __restrict #else #define LODEPNG_RESTRICT /* not available */ |