TeaSpeak
/
spdlog
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #31 from rupertsteel/master 

Fixed 2 macro redefinition warnings related to WIN32_LEAN_AND_MEAN.
This commit is contained in:
Gabi Melman 2015-01-12 07:51:37 +02:00
parent 1d8ac6de6d 5d7947df9d
commit c3f8200ad5
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/spdlog/details/format.cc
View File

@ -39,7 +39,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <cstdarg>
#ifdef _WIN32
# define WIN32_LEAN_AND_MEAN
# ifndef WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
# endif
# ifdef __MINGW32__
# include <cstring>
# endif

6
include/spdlog/details/os.h
View File

@ -29,8 +29,10 @@
#include<ctime>
#ifdef _WIN32
#define WIN32_LEAN_AND_MEAN
#include <Windows.h>
# ifndef WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
# endif
# include <Windows.h>
#endif
namespace spdlog