diff options
| author | Attila Molnar <attilamolnar@hush.com> | 2016-02-22 12:52:18 +0100 |
|---|---|---|
| committer | Attila Molnar <attilamolnar@hush.com> | 2016-02-22 12:52:18 +0100 |
| commit | 0b63ccd0b5cb26883d6becb196fb98e4f95d0397 (patch) | |
| tree | d9c660b46e106d76c5953579eca45e49c4486cbf /win | |
| parent | 7b6bd133ca4472f6cb8058d5e34e3c8b2af7e99a (diff) | |
| parent | 1624ab03b86542a2cb02eda809303144974755f3 (diff) | |
Merge insp20
Diffstat (limited to 'win')
| -rw-r--r-- | win/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | win/inspircd_win32wrapper.h | 7 |
2 files changed, 10 insertions, 1 deletions
diff --git a/win/CMakeLists.txt b/win/CMakeLists.txt index 3cfe9f6b8..768270696 100644 --- a/win/CMakeLists.txt +++ b/win/CMakeLists.txt @@ -78,6 +78,10 @@ install(FILES ${EXTRA_DLLS} DESTINATION .) file(GLOB_RECURSE EXAMPLE_CONFIGS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${INSPIRCD_BASE}/docs/conf/*.example") install(FILES ${EXAMPLE_CONFIGS} DESTINATION conf) +# Install nationalchars files +file(GLOB_RECURSE EXAMPLE_LOCALES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${INSPIRCD_BASE}/locales/*") +install(FILES ${EXAMPLE_LOCALES} DESTINATION locales) + # Create an empty data and logs directory and install them file(MAKE_DIRECTORY ${DATA_DIR}) install(DIRECTORY ${DATA_DIR} DESTINATION .) diff --git a/win/inspircd_win32wrapper.h b/win/inspircd_win32wrapper.h index 2218d9300..d65d4eb92 100644 --- a/win/inspircd_win32wrapper.h +++ b/win/inspircd_win32wrapper.h @@ -58,6 +58,7 @@ /* Disable the deprecation warnings.. it spams :P */ #define _CRT_SECURE_NO_DEPRECATE +#define _WINSOCK_DEPRECATED_NO_WARNINGS /* Normal windows (platform-specific) includes */ #include <winsock2.h> @@ -96,9 +97,11 @@ CoreExport const char * insp_inet_ntop(int af, const void * src, char * dst, soc #define inet_pton insp_inet_pton #define inet_ntop insp_inet_ntop -/* Safe printf functions aren't defined in VC++ */ +/* Safe printf functions aren't defined in VC++ releases older than v14 */ +#if _MSC_VER <= 1800 #define snprintf _snprintf #define vsnprintf _vsnprintf +#endif #ifndef va_copy #define va_copy(dest, src) (dest = src) @@ -149,11 +152,13 @@ struct DIR bool first; }; +#if _MSC_VER <= 1800 struct timespec { time_t tv_sec; long tv_nsec; }; +#endif CoreExport DIR * opendir(const char * path); CoreExport dirent * readdir(DIR * handle); |