1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-09-02 10:48:04 +00:00

Eliminate directives inside macro expansions, for the benefit of MSVC.

This commit is contained in:
Arthur O'Dwyer
2018-06-26 22:41:56 -07:00
parent 87dc7dcd62
commit 00e1db9f05
7 changed files with 42 additions and 78 deletions

View File

@@ -2,11 +2,6 @@
// Copyright (C) 2011-2018 Zeno Rogue, see 'hyper.cpp' for details
#define GEN_M 0
#define GEN_F 1
#define GEN_N 2
#define GEN_O 3
#include <map>
#include <string>
#include <cstdio>
@@ -14,6 +9,17 @@
#include <cstdlib>
#include <set>
#define GEN_M 0
#define GEN_F 1
#define GEN_N 2
#define GEN_O 3
#if MAC
#define IF_MAC(y,z) y
#else
#define IF_MAC(y,z) z
#endif
template<class T> int isize(const T& x) { return x.size(); }
#define NUMLAN 7