Use feature detection macros everywhere

This commit is contained in:
Corentin Wallez
2017-07-12 12:56:05 -04:00
committed by Corentin Wallez
parent 4db6327f78
commit 0b186b1fda
6 changed files with 51 additions and 15 deletions

View File

@@ -21,6 +21,7 @@ list(APPEND COMMON_SOURCES
${COMMON_DIR}/Compiler.h
${COMMON_DIR}/Math.cpp
${COMMON_DIR}/Math.h
${COMMON_DIR}/Platform.h
${COMMON_DIR}/Serial.h
${COMMON_DIR}/SerialQueue.h
)

View File

@@ -16,13 +16,13 @@
#include "common/Assert.h"
#if defined(_WIN32) || defined(_WIN64)
#if defined(NXT_COMPILER_MSVC)
#include <intrin.h>
#endif
uint32_t ScanForward(uint32_t bits) {
ASSERT(bits != 0);
#if defined(_WIN32) || defined(_WIN64)
#if defined(NXT_COMPILER_MSVC)
unsigned long firstBitIndex = 0ul;
unsigned char ret = _BitScanForward(&firstBitIndex, bits);
ASSERT(ret != 0);
@@ -34,7 +34,7 @@ uint32_t ScanForward(uint32_t bits) {
uint32_t Log2(uint32_t value) {
ASSERT(value != 0);
#if defined(_WIN32) || defined(_WIN64)
#if defined(NXT_COMPILER_MSVC)
unsigned long firstBitIndex = 0ul;
unsigned char ret = _BitScanReverse(&firstBitIndex, value);
ASSERT(ret != 0);

30
src/common/Platform.h Normal file
View File

@@ -0,0 +1,30 @@
// Copyright 2017 The NXT Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#ifndef COMMON_PLATFORM_H_
#define COMMON_PLATFORM_H_
#if defined(_WIN32) || defined(_WIN64)
#define NXT_PLATFORM_WINDOWS 1
#elif defined(__linux__)
#define NXT_PLATFORM_LINUX 1
#define NXT_PLATFORM_POSIX 1
#elif defined(__APPLE__)
#define NXT_PLATFORM_APPLE 1
#define NXT_PLATFORM_POSIX 1
#else
#error "Unsupported platform."
#endif
#endif // COMMON_PLATFORM_H_