#include "platform.h"
+#define unlikely(x) (x) // For code annotation purposes
+
#if defined(_WIN64) && !defined(IS_64BIT)
# include <intrin.h> // MSVC popcnt and bsfq instrinsics
# define IS_64BIT
# define FORCE_INLINE inline
#endif
-#ifdef __GNUC__
-# define likely(x) __builtin_expect(!!(x), 1)
-# define unlikely(x) __builtin_expect(!!(x), 0)
-#else
-# define likely(x) (x)
-# define unlikely(x) (x)
-#endif
-
#if defined(USE_POPCNT)
const bool HasPopCnt = true;
#else
extern Value PieceValue[PHASE_NB][PIECE_NB];
-struct MoveStack {
+struct ExtMove {
Move move;
int score;
};
-inline bool operator<(const MoveStack& f, const MoveStack& s) {
+inline bool operator<(const ExtMove& f, const ExtMove& s) {
return f.score < s.score;
}