diff options
| author | Haru <haru@dotalux.com> | 2015-08-10 10:36:09 -0700 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2015-08-10 19:42:54 +0200 |
| commit | 5ad96bcc2af2a5a76348fca87e52a0f038461808 (patch) | |
| tree | 46a209c636d2139249d123a8cae7e7f44d1c1838 /src/common | |
| parent | ad6e02cc4cd1e3bd079888b1de847788e95e4c3b (diff) | |
| download | hercules-5ad96bcc2af2a5a76348fca87e52a0f038461808.tar.gz hercules-5ad96bcc2af2a5a76348fca87e52a0f038461808.tar.bz2 hercules-5ad96bcc2af2a5a76348fca87e52a0f038461808.tar.xz hercules-5ad96bcc2af2a5a76348fca87e52a0f038461808.zip | |
Added support for visual Studio 2015
Please report any issues
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/HPMi.h | 2 | ||||
| -rw-r--r-- | src/common/cbasetypes.h | 2 | ||||
| -rw-r--r-- | src/common/sysinfo.c | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src/common/HPMi.h b/src/common/HPMi.h index b700c1b73..bf4eb83c8 100644 --- a/src/common/HPMi.h +++ b/src/common/HPMi.h @@ -200,7 +200,7 @@ enum HPluginConfType { #define addGroupPermission(pcgname,maskptr) HPMi->addPCGPermission(HPMi->pid,pcgname,&maskptr) /* Hercules Plugin Mananger Include Interface */ -HPExport struct HPMi_interface { +struct HPMi_interface { /* */ unsigned int pid; /* */ diff --git a/src/common/cbasetypes.h b/src/common/cbasetypes.h index ce8fc6bcf..575428f96 100644 --- a/src/common/cbasetypes.h +++ b/src/common/cbasetypes.h @@ -240,7 +240,9 @@ typedef uintptr_t uintptr; #define strcasecmp stricmp #define strncasecmp strnicmp #define strncmpi strnicmp +#if defined(__BORLANDC__) || _MSC_VER < 1900 #define snprintf _snprintf +#endif #if defined(_MSC_VER) && _MSC_VER < 1400 #define vsnprintf _vsnprintf #endif diff --git a/src/common/sysinfo.c b/src/common/sysinfo.c index a27357e7e..105f300ad 100644 --- a/src/common/sysinfo.c +++ b/src/common/sysinfo.c @@ -197,7 +197,9 @@ enum windows_ver_suite { #define SYSINFO_COMPILER "Microsoft Visual C++ 2012 (v" EXPAND_AND_QUOTE(_MSC_VER) ")" #elif _MSC_VER >= 1800 && _MSC_VER < 1900 #define SYSINFO_COMPILER "Microsoft Visual C++ 2013 (v" EXPAND_AND_QUOTE(_MSC_VER) ")" -#else // < 1300 || >= 1900 +#elif _MSC_VER >= 1900 && _MSC_VER < 2000 +#define SYSINFO_COMPILER "Microsoft Visual C++ 2015 (v" EXPAND_AND_QUOTE(_MSC_VER) ")" +#else // < 1300 || >= 2000 #define SYSINFO_COMPILER "Microsoft Visual C++ v" EXPAND_AND_QUOTE(_MSC_VER) #endif #else |