Merge remote-tracking branch 'bunnei/master'

This commit is contained in:
inspuration 2014-06-10 14:59:44 -04:00
commit ad6a99524c

View file

@ -96,8 +96,6 @@ private:
// Windows compatibility
#ifndef _WIN32
#include <limits.h>
#define MAX_PATH PATH_MAX
#ifdef _LP64
#define _M_X64 1
#else