From 2cd1e4b7c69f98220a57835a8e545d971ee9f355 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 22 Mar 2019 12:58:57 +0100 Subject: [PATCH] Do not use GL-related ifdefs for API-agnostic functionality. --- src/Magnum/Magnum.h | 8 +++++--- src/Magnum/Types.h | 3 ++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Magnum/Magnum.h b/src/Magnum/Magnum.h index 81f7a64e0..235391b20 100644 --- a/src/Magnum/Magnum.h +++ b/src/Magnum/Magnum.h @@ -204,18 +204,20 @@ Equivalent to GLSL @glsl int @ce. */ typedef std::int32_t Int; -#ifndef MAGNUM_TARGET_WEBGL +#ifndef CORRADE_TARGET_EMSCRIPTEN /** @brief Unsigned long (64bit) -@requires_gles 64-bit integers are not available in WebGL. +@partialsupport 64-bit integers are not available under + @ref CORRADE_TARGET_EMSCRIPTEN "Emscripten". */ typedef std::uint64_t UnsignedLong; /** @brief Signed long (64bit) -@requires_gles 64-bit integers are not available in WebGL. +@partialsupport 64-bit integers are not available in + @ref CORRADE_TARGET_EMSCRIPTEN "Emscripten". */ typedef std::int64_t Long; #endif diff --git a/src/Magnum/Types.h b/src/Magnum/Types.h index 46d956d77..e4c0bcb3c 100644 --- a/src/Magnum/Types.h +++ b/src/Magnum/Types.h @@ -31,6 +31,7 @@ #include +#include "Corrade/configure.h" #include "Magnum/configure.h" namespace Magnum { @@ -42,7 +43,7 @@ typedef std::uint16_t UnsignedShort; typedef std::int16_t Short; typedef std::uint32_t UnsignedInt; typedef std::int32_t Int; -#ifndef MAGNUM_TARGET_WEBGL +#ifndef CORRADE_TARGET_EMSCRIPTEN typedef std::uint64_t UnsignedLong; typedef std::int64_t Long; #endif