includes: Allow headers to be built with C++11 compilers
authorBen Gamari <bgamari.foss@gmail.com>
Sun, 28 Oct 2018 16:24:06 +0000 (12:24 -0400)
committerBen Gamari <ben@smart-cactus.org>
Sun, 28 Oct 2018 17:32:47 +0000 (13:32 -0400)
Summary:
Fixes #14784. Note that C++11 is quite conservative; we could likely accept
C++03 as well.

Test Plan:
```
$ cat >hi.c <<EOF
#include <Rts.h>
EOF
$ g++ -std=c++11 hi.c
```

Reviewers: simonmar, hvr

Subscribers: rwbarton, carter

GHC Trac Issues: #14784

Differential Revision: https://phabricator.haskell.org/D5244

(cherry picked from commit d3a1022fabb0ad337003fac774c6929f402ecb8b)

includes/Stg.h

index 2e02347..31b2c45 100644 (file)
@@ -25,8 +25,8 @@
 
 #pragma once
 
-#if !(__STDC_VERSION__ >= 199901L)
-# error __STDC_VERSION__ does not advertise C99 or later
+#if !(__STDC_VERSION__ >= 199901L) && !(__cplusplus >= 201103L)
+# error __STDC_VERSION__ does not advertise C99, C++11 or later
 #endif
 
 /*