Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
18a513f8
Commit
18a513f8
authored
May 30, 2016
by
antirez
Browse files
Merge branch 'unstable' of github.com:/antirez/redis into unstable
parents
4eff3dc4
8c4f4d12
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/Makefile
View file @
18a513f8
...
@@ -55,7 +55,7 @@ endif
...
@@ -55,7 +55,7 @@ endif
FINAL_CFLAGS
=
$(STD)
$(WARN)
$(OPT)
$(DEBUG)
$(CFLAGS)
$(REDIS_CFLAGS)
-I
../deps/geohash-int
FINAL_CFLAGS
=
$(STD)
$(WARN)
$(OPT)
$(DEBUG)
$(CFLAGS)
$(REDIS_CFLAGS)
-I
../deps/geohash-int
FINAL_LDFLAGS
=
$(LDFLAGS)
$(REDIS_LDFLAGS)
$(DEBUG)
FINAL_LDFLAGS
=
$(LDFLAGS)
$(REDIS_LDFLAGS)
$(DEBUG)
FINAL_LIBS
=
-lm
FINAL_LIBS
=
-lm
-ldl
DEBUG
=
-g
-ggdb
DEBUG
=
-g
-ggdb
ifeq
($(uname_S),SunOS)
ifeq
($(uname_S),SunOS)
...
@@ -95,7 +95,7 @@ endif
...
@@ -95,7 +95,7 @@ endif
ifeq
($(MALLOC),jemalloc)
ifeq
($(MALLOC),jemalloc)
DEPENDENCY_TARGETS
+=
jemalloc
DEPENDENCY_TARGETS
+=
jemalloc
FINAL_CFLAGS
+=
-DUSE_JEMALLOC
-I
../deps/jemalloc/include
FINAL_CFLAGS
+=
-DUSE_JEMALLOC
-I
../deps/jemalloc/include
FINAL_LIBS
+=
../deps/jemalloc/lib/libjemalloc.a
-ldl
FINAL_LIBS
+=
../deps/jemalloc/lib/libjemalloc.a
endif
endif
REDIS_CC
=
$(QUIET_CC)$(CC)
$(FINAL_CFLAGS)
REDIS_CC
=
$(QUIET_CC)$(CC)
$(FINAL_CFLAGS)
...
...
src/redis-cli.c
View file @
18a513f8
...
@@ -284,7 +284,6 @@ static void cliIntegrateHelp(void) {
...
@@ -284,7 +284,6 @@ static void cliIntegrateHelp(void) {
break
;
break
;
}
}
if
(
i
!=
helpEntriesLen
)
continue
;
if
(
i
!=
helpEntriesLen
)
continue
;
printf
(
"%s
\n
"
,
cmdname
);
helpEntriesLen
++
;
helpEntriesLen
++
;
helpEntries
=
zrealloc
(
helpEntries
,
sizeof
(
helpEntry
)
*
helpEntriesLen
);
helpEntries
=
zrealloc
(
helpEntries
,
sizeof
(
helpEntry
)
*
helpEntriesLen
);
...
@@ -314,8 +313,6 @@ static void cliIntegrateHelp(void) {
...
@@ -314,8 +313,6 @@ static void cliIntegrateHelp(void) {
new
->
org
=
ch
;
new
->
org
=
ch
;
}
}
freeReplyObject
(
reply
);
freeReplyObject
(
reply
);
printf
(
"%s
\n
"
,
helpEntries
[
80
].
full
);
}
}
/* Output command help to stdout. */
/* Output command help to stdout. */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment