Skip to content

Commit dae5237

Browse files
trondndaverigby
authored andcommitted
Add build support for VS2015 Community edition
Change-Id: Ibd667fdfe632b40a18ab0b0feb709301deb9631a Reviewed-on: http://review.couchbase.org/53552 Tested-by: buildbot <[email protected]> Reviewed-by: Dave Rigby <[email protected]>
1 parent 9186959 commit dae5237

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

CMakeLists.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ ADD_LIBRARY(conflate SHARED
3838

3939
IF(WIN32)
4040
INCLUDE_DIRECTORIES(AFTER ${CMAKE_SOURCE_DIR}/platform/include/win32)
41-
ADD_DEFINITIONS(-Dsnprintf=_snprintf)
41+
IF (${CMAKE_C_COMPILER_VERSION} VERSION_LESS 19)
42+
ADD_DEFINITIONS(-Dsnprintf=_snprintf)
43+
ENDIF (${CMAKE_C_COMPILER_VERSION} VERSION_LESS 19)
4244
ELSE(WIN32)
4345
SET(ZLIB z)
4446
ENDIF(WIN32)

libmemcached/win32/wrappers.h

+2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@
2424
#undef malloc
2525
#undef realloc
2626

27+
#if _MSC_VER < 1900
2728
#define snprintf _snprintf
29+
#endif
2830
#define PRIu64 "I64u"
2931

3032
#define poll(a,b,c) WSAPoll(a,b,c)

0 commit comments

Comments
 (0)