null+****@clear*****
null+****@clear*****
2012年 4月 13日 (金) 13:09:06 JST
Kouhei Sutou 2012-04-13 13:09:06 +0900 (Fri, 13 Apr 2012)
New Revision: e139b249ce08631d59c09b59683f53f906965726
Log:
Remove "no" condition variable name
NO_ZLIB -> WITH_ZLIB
Modified files:
configure.ac
lib/db.c
lib/store.c
Modified: configure.ac (+2 -3)
===================================================================
--- configure.ac 2012-04-13 13:07:34 +0900 (07e383b)
+++ configure.ac 2012-04-13 13:09:06 +0900 (731254a)
@@ -761,9 +761,8 @@ AC_ARG_WITH(zlib,
[use zlib for data compression. [default=no]])],
[with_zlib="$withval"],
[with_zlib="no"])
-if test "x$with_zlib" = "xno"; then
- AC_DEFINE(NO_ZLIB, [1], [without zlib])
-else
+if test "x$with_zlib" = "xyes"; then
+ AC_DEFINE(WITH_ZLIB, [1], [with zlib])
AC_CHECK_LIB(z, compress, [ZLIB_LIBS="-lz"], [AC_MSG_ERROR("No libz found")])
fi
Modified: lib/db.c (+3 -3)
===================================================================
--- lib/db.c 2012-04-13 13:07:34 +0900 (affc150)
+++ lib/db.c 2012-04-13 13:09:06 +0900 (c53502e)
@@ -3425,11 +3425,11 @@ grn_column_create(grn_ctx *ctx, grn_obj *table,
if (ja_p) {
grn_bool zlib_p = GRN_FALSE;
grn_bool lzo_p = GRN_FALSE;
-#ifndef NO_ZLIB
+#ifdef WITH_ZLIB
if (flags & GRN_OBJ_COMPRESS_ZLIB) {
zlib_p = GRN_TRUE;
}
-#endif /* NO_ZLIB */
+#endif /* WITH_ZLIB */
#ifdef WITH_LZO
if (flags & GRN_OBJ_COMPRESS_LZO) {
lzo_p = GRN_TRUE;
@@ -5648,7 +5648,7 @@ grn_obj_get_info(grn_ctx *ctx, grn_obj *obj, grn_info_type type, grn_obj *valueb
"failed to open value buffer for GRN_INFO_ZLIB_SUPPORT");
goto exit;
}
-#ifndef NO_ZLIB
+#ifdef WITH_ZLIB
GRN_BOOL_PUT(ctx, valuebuf, GRN_TRUE);
#else
GRN_BOOL_PUT(ctx, valuebuf, GRN_FALSE);
Modified: lib/store.c (+8 -8)
===================================================================
--- lib/store.c 2012-04-13 13:07:34 +0900 (1d5b03b)
+++ lib/store.c 2012-04-13 13:09:06 +0900 (6d80f97)
@@ -1046,7 +1046,7 @@ grn_ja_element_info(grn_ctx *ctx, grn_ja *ja, grn_id id,
return GRN_SUCCESS;
}
-#ifndef NO_ZLIB
+#ifdef WITH_ZLIB
#include <zlib.h>
static void *
@@ -1090,7 +1090,7 @@ grn_ja_ref_zlib(grn_ctx *ctx, grn_ja *ja, grn_id id, grn_io_win *iw, uint32_t *v
}
return value;
}
-#endif /* NO_ZLIB */
+#endif /* WITH_ZLIB */
#ifdef WITH_LZO
#include <lzo/lzo1x.h>
@@ -1133,11 +1133,11 @@ grn_ja_ref_lzo(grn_ctx *ctx, grn_ja *ja, grn_id id, grn_io_win *iw, uint32_t *va
void *
grn_ja_ref(grn_ctx *ctx, grn_ja *ja, grn_id id, grn_io_win *iw, uint32_t *value_len)
{
-#ifndef NO_ZLIB
+#ifdef WITH_ZLIB
if (ja->header->flags & GRN_OBJ_COMPRESS_ZLIB) {
return grn_ja_ref_zlib(ctx, ja, id, iw, value_len);
}
-#endif /* NO_ZLIB */
+#endif /* WITH_ZLIB */
#ifdef WITH_LZO
if (ja->header->flags & GRN_OBJ_COMPRESS_LZO) {
return grn_ja_ref_lzo(ctx, ja, id, iw, value_len);
@@ -1176,7 +1176,7 @@ exit :
return value;
}
-#ifndef NO_ZLIB
+#ifdef WITH_ZLIB
inline static grn_rc
grn_ja_put_zlib(grn_ctx *ctx, grn_ja *ja, grn_id id,
void *value, uint32_t value_len, int flags, uint64_t *cas)
@@ -1222,7 +1222,7 @@ grn_ja_put_zlib(grn_ctx *ctx, grn_ja *ja, grn_id id,
GRN_FREE(zvalue);
return rc;
}
-#endif /* NO_ZLIB */
+#endif /* WITH_ZLIB */
#ifdef WITH_LZO
inline static grn_rc
@@ -1257,11 +1257,11 @@ grn_rc
grn_ja_put(grn_ctx *ctx, grn_ja *ja, grn_id id, void *value, uint32_t value_len,
int flags, uint64_t *cas)
{
-#ifndef NO_ZLIB
+#ifdef WITH_ZLIB
if (ja->header->flags & GRN_OBJ_COMPRESS_ZLIB) {
return grn_ja_put_zlib(ctx, ja, id, value, value_len, flags, cas);
}
-#endif /* NO_ZLIB */
+#endif /* WITH_ZLIB */
#ifdef WITH_LZO
if (ja->header->flags & GRN_OBJ_COMPRESS_LZO) {
return grn_ja_put_lzo(ctx, ja, id, value, value_len, flags, cas);