null+****@clear*****
null+****@clear*****
2012年 4月 13日 (金) 17:53:09 JST
Kouhei Sutou 2012-04-13 17:53:09 +0900 (Fri, 13 Apr 2012)
New Revision: de3b0a0049620ba86b90269909fa5e4842f07f61
Log:
configure: use USE_ prefix for build switches
Modified files:
configure.ac
lib/dat/file-impl.cpp
Modified: configure.ac (+1 -1)
===================================================================
--- configure.ac 2012-04-13 17:46:42 +0900 (fb58265)
+++ configure.ac 2012-04-13 17:53:09 +0900 (aaa4f18)
@@ -358,7 +358,7 @@ if test "x$enable_map_hugetlb" != "xno"; then
[MAP_HUGETLB;]
)],
[
- AC_DEFINE(GROONGA_USE_MAP_HUGETLB, [1], [use MAP_HUGETLB])
+ AC_DEFINE(USE_MAP_HUGETLB, [1], [use MAP_HUGETLB])
AC_MSG_RESULT(yes)
],
[
Modified: lib/dat/file-impl.cpp (+2 -2)
===================================================================
--- lib/dat/file-impl.cpp 2012-04-13 17:46:42 +0900 (3547a43)
+++ lib/dat/file-impl.cpp 2012-04-13 17:53:09 +0900 (0903df7)
@@ -206,10 +206,10 @@ void FileImpl::create_(const char *path, UInt64 size) {
#endif // MAP_ANONYMOUS
length_ = static_cast< ::size_t>(size);
-#ifdef GROONGA_USE_MAP_HUGETLB
+#ifdef USE_MAP_HUGETLB
addr_ = ::mmap(NULL, length_, PROT_READ | PROT_WRITE,
flags | MAP_HUGETLB, fd_, 0);
-#endif // GROONGA_USE_MAP_HUGETLB
+#endif // USE_MAP_HUGETLB
if (addr_ == MAP_FAILED) {
addr_ = ::mmap(NULL, length_, PROT_READ | PROT_WRITE, flags, fd_, 0);
GRN_DAT_THROW_IF(IO_ERROR, addr_ == MAP_FAILED);