Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
18d0759b
Commit
18d0759b
authored
Nov 19, 2018
by
antirez
Browse files
Merge branch 'unstable' of github.com:/antirez/redis into unstable
parents
db8d7d3d
7721fe83
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/Makefile
View file @
18d0759b
...
@@ -21,6 +21,11 @@ NODEPS:=clean distclean
...
@@ -21,6 +21,11 @@ NODEPS:=clean distclean
# Default settings
# Default settings
STD
=
-std
=
c99
-pedantic
-DREDIS_STATIC
=
''
STD
=
-std
=
c99
-pedantic
-DREDIS_STATIC
=
''
ifneq
(,$(findstring clang,$(CC)))
ifneq
(,$(findstring FreeBSD,$(uname_S)))
STD
+=
-Wno-c11-extensions
endif
endif
WARN
=
-Wall
-W
-Wno-missing-field-initializers
WARN
=
-Wall
-W
-Wno-missing-field-initializers
OPT
=
$(OPTIMIZATION)
OPT
=
$(OPTIMIZATION)
...
...
src/debug.c
View file @
18d0759b
...
@@ -1189,6 +1189,8 @@ void serverLogHexDump(int level, char *descr, void *value, size_t len) {
...
@@ -1189,6 +1189,8 @@ void serverLogHexDump(int level, char *descr, void *value, size_t len) {
void
watchdogSignalHandler
(
int
sig
,
siginfo_t
*
info
,
void
*
secret
)
{
void
watchdogSignalHandler
(
int
sig
,
siginfo_t
*
info
,
void
*
secret
)
{
#ifdef HAVE_BACKTRACE
#ifdef HAVE_BACKTRACE
ucontext_t
*
uc
=
(
ucontext_t
*
)
secret
;
ucontext_t
*
uc
=
(
ucontext_t
*
)
secret
;
#else
(
void
)
secret
;
#endif
#endif
UNUSED
(
info
);
UNUSED
(
info
);
UNUSED
(
sig
);
UNUSED
(
sig
);
...
...
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