HAYASHI Kentaro
null+****@clear*****
Fri Jan 24 17:36:41 JST 2014
HAYASHI Kentaro 2014-01-24 17:36:41 +0900 (Fri, 24 Jan 2014) New Revision: ac0e1c77218cf88b6ae66fd5534a312582bd88e8 https://github.com/groonga/groonga/commit/ac0e1c77218cf88b6ae66fd5534a312582bd88e8 Message: windows: fix conflicted declaration in MinGW environment This change fixes following error: /usr/lib/gcc/i686-w64-mingw32/4.6/../../../../i686-w64-mingw32/include/stdio.h:339:5: error: previous declaration of 'int _snprintf(char*, size_t, const char*, ...)' with 'C++' linkage /usr/lib/gcc/i686-w64-mingw32/4.6/../../../../i686-w64-mingw32/include/stdio.h:532:110: error: conflicts with new declaration with 'C' linkage Modified files: lib/groonga_in.h Modified: lib/groonga_in.h (+3 -1) =================================================================== --- lib/groonga_in.h 2014-01-24 16:48:37 +0900 (7905a0c) +++ lib/groonga_in.h 2014-01-24 17:36:41 +0900 (26fd4f3) @@ -119,7 +119,9 @@ # endif #endif -#define snprintf(str, size, ...) _snprintf(str, size, __VA_ARGS__) +#ifndef __GNUC__ +# define snprintf(str, size, ...) _snprintf(str, size, __VA_ARGS__) +#endif #if _MSC_VER < 1500 # define vsnprintf(str, size, format, ap) _vsnprintf(str, size, format, ap) #endif /* _MSC_VER < 1500 */ -------------- next part -------------- HTML����������������������������...Download