From: <ust...@us...> - 2008-07-04 08:37:26
|
Revision: 2743 http://clucene.svn.sourceforge.net/clucene/?rev=2743&view=rev Author: ustramooner Date: 2008-07-04 01:37:21 -0700 (Fri, 04 Jul 2008) Log Message: ----------- fix for if no _snprintf is available (cmake driven) Modified Paths: -------------- branches/lucene2_3_2/src/demo/CMakeLists.txt branches/lucene2_3_2/src/demo/IndexFiles.cpp branches/lucene2_3_2/src/demo/config.h.cmake Modified: branches/lucene2_3_2/src/demo/CMakeLists.txt =================================================================== --- branches/lucene2_3_2/src/demo/CMakeLists.txt 2008-07-04 08:13:26 UTC (rev 2742) +++ branches/lucene2_3_2/src/demo/CMakeLists.txt 2008-07-04 08:37:21 UTC (rev 2743) @@ -7,6 +7,7 @@ INCLUDE_DIRECTORIES( ${clucene-demo_SOURCE_DIR} ) CHECK_FUNCTION_EXISTS (gettimeofday _CL_HAVE_GETTIMEOFDAY) +CHECK_FUNCTION_EXISTS (_snprintf _CL_HAVE__SNPRINTF) CONFIGURE_FILE(${cl_demo_SOURCE_DIR}/config.h.cmake ${cl_demo_BINARY_DIR}/config.h) file(GLOB_RECURSE HEADERS ${CMAKE_SOURCE_DIR}/test/*.h) @@ -20,6 +21,7 @@ ./stdafx.cpp ./dirent.cpp ${HEADERS} +${cl_demo_BINARY_DIR}/config.h ) Modified: branches/lucene2_3_2/src/demo/IndexFiles.cpp =================================================================== --- branches/lucene2_3_2/src/demo/IndexFiles.cpp 2008-07-04 08:13:26 UTC (rev 2742) +++ branches/lucene2_3_2/src/demo/IndexFiles.cpp 2008-07-04 08:37:21 UTC (rev 2743) @@ -14,8 +14,8 @@ #include <cctype> #include <string> -#ifndef _snprintf - //#define _snprintf snprintf +#ifndef _CL_HAVE__SNPRINTF + #define _snprintf snprintf #endif using namespace std; @@ -74,7 +74,7 @@ struct dirent* fl; char path[CL_MAX_DIR]; - snprintf(path,CL_MAX_DIR,"%s/",directory); + _snprintf(path,CL_MAX_DIR,"%s/",directory); char* pathP = path + strlen(path); fl = readdir(dir); Modified: branches/lucene2_3_2/src/demo/config.h.cmake =================================================================== --- branches/lucene2_3_2/src/demo/config.h.cmake 2008-07-04 08:13:26 UTC (rev 2742) +++ branches/lucene2_3_2/src/demo/config.h.cmake 2008-07-04 08:37:21 UTC (rev 2743) @@ -2,5 +2,6 @@ #define _CLUCENE_DEMO_CONFIG_H #cmakedefine _CL_HAVE_GETTIMEOFDAY +#cmakedefine _CL_HAVE__SNPRINTF #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |