diff --git a/internal/cgen/base/all-impl.c b/internal/cgen/base/all-impl.c index f65f3ad4..cd54fe67 100644 --- a/internal/cgen/base/all-impl.c +++ b/internal/cgen/base/all-impl.c @@ -31,11 +31,14 @@ #include #include +// Note that Clang also defines __GNUC__. #ifdef __cplusplus #if __cplusplus >= 201103L #include -#else -#warning "Wuffs' C++ code requires -std=c++11 or later" +#elif defined(__GNUC__) +#warning "Wuffs' C++ code expects -std=c++11 or later" +#elif defined(_MSC_VER) +#pragma message("Wuffs' C++ code expects C++11 or later") #endif extern "C" { diff --git a/internal/cgen/data/data.go b/internal/cgen/data/data.go index 1abc974b..1242a486 100644 --- a/internal/cgen/data/data.go +++ b/internal/cgen/data/data.go @@ -17,7 +17,7 @@ package data const BaseAllImplC = "" + - "#ifndef WUFFS_INCLUDE_GUARD__BASE\n#define WUFFS_INCLUDE_GUARD__BASE\n\n#if defined(WUFFS_IMPLEMENTATION) && !defined(WUFFS_CONFIG__MODULES)\n#define WUFFS_CONFIG__MODULES\n#define WUFFS_CONFIG__MODULE__BASE\n#endif\n\n// !! WUFFS MONOLITHIC RELEASE DISCARDS EVERYTHING ABOVE.\n\n// !! INSERT base/copyright\n\n#include \n#include \n#include \n#include \n\n#ifdef __cplusplus\n#if __cplusplus >= 201103L\n#include \n#else\n#warning \"Wuffs' C++ code requires -std=c++11 or later\"\n#endif\n\nextern \"C\" {\n#endif\n\n// !! INSERT base/all-public.h.\n\n// !! INSERT InterfaceDeclarations.\n\n" + + "#ifndef WUFFS_INCLUDE_GUARD__BASE\n#define WUFFS_INCLUDE_GUARD__BASE\n\n#if defined(WUFFS_IMPLEMENTATION) && !defined(WUFFS_CONFIG__MODULES)\n#define WUFFS_CONFIG__MODULES\n#define WUFFS_CONFIG__MODULE__BASE\n#endif\n\n// !! WUFFS MONOLITHIC RELEASE DISCARDS EVERYTHING ABOVE.\n\n// !! INSERT base/copyright\n\n#include \n#include \n#include \n#include \n\n// Note that Clang also defines __GNUC__.\n#ifdef __cplusplus\n#if __cplusplus >= 201103L\n#include \n#elif defined(__GNUC__)\n#warning \"Wuffs' C++ code expects -std=c++11 or later\"\n#elif defined(_MSC_VER)\n#pragma message(\"Wuffs' C++ code expects C++11 or later\")\n#endif\n\nextern \"C\" {\n#endif\n\n// !! INSERT base/all-public.h.\n\n// !! INSERT InterfaceDeclarations.\n\n" + "" + "// ----------------\n\n#ifdef __cplusplus\n} // extern \"C\"\n#endif\n\n// WUFFS C HEADER ENDS HERE.\n#ifdef WUFFS_IMPLEMENTATION\n\n#ifdef __cplusplus\nextern \"C\" {\n#endif\n\n// !! INSERT base/all-private.h.\n\n" + "" + diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 5fffc3ff..580e4eb4 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -35,11 +35,14 @@ #include #include +// Note that Clang also defines __GNUC__. #ifdef __cplusplus #if __cplusplus >= 201103L #include -#else -#warning "Wuffs' C++ code requires -std=c++11 or later" +#elif defined(__GNUC__) +#warning "Wuffs' C++ code expects -std=c++11 or later" +#elif defined(_MSC_VER) +#pragma message("Wuffs' C++ code expects C++11 or later") #endif extern "C" {