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
a7b9cfbe
"doc/QuitCommand.html" did not exist on "81d456450ac42b7cf78367ae3a89af1a543c9ff1"
Commit
a7b9cfbe
authored
Sep 29, 2020
by
David CARLIER
Committed by
Oran Agra
Oct 27, 2020
Browse files
Add support for Haiku OS (#7435)
(cherry picked from commit
f971a5d8
)
parent
219bab2d
Changes
3
Show whitespace changes
Inline
Side-by-side
src/Makefile
View file @
a7b9cfbe
...
@@ -145,6 +145,12 @@ else
...
@@ -145,6 +145,12 @@ else
ifeq
($(uname_S),NetBSD)
ifeq
($(uname_S),NetBSD)
# NetBSD
# NetBSD
FINAL_LIBS
+=
-lpthread
-lexecinfo
FINAL_LIBS
+=
-lpthread
-lexecinfo
else
ifeq
($(uname_S),Haiku)
# Haiku
FINAL_CFLAGS
+=
-DBSD_SOURCE
FINAL_LDFLAGS
+=
-lbsd
-lnetwork
FINAL_LIBS
+=
-lpthread
else
else
# All the other OSes (notably Linux)
# All the other OSes (notably Linux)
FINAL_LDFLAGS
+=
-rdynamic
FINAL_LDFLAGS
+=
-rdynamic
...
@@ -158,6 +164,7 @@ endif
...
@@ -158,6 +164,7 @@ endif
endif
endif
endif
endif
endif
endif
endif
# Include paths to dependencies
# Include paths to dependencies
FINAL_CFLAGS
+=
-I
../deps/hiredis
-I
../deps/linenoise
-I
../deps/lua/src
FINAL_CFLAGS
+=
-I
../deps/hiredis
-I
../deps/linenoise
-I
../deps/lua/src
...
...
src/config.h
View file @
a7b9cfbe
...
@@ -124,6 +124,10 @@
...
@@ -124,6 +124,10 @@
#define USE_SETPROCTITLE
#define USE_SETPROCTITLE
#endif
#endif
#if defined(__HAIKU__)
#define ESOCKTNOSUPPORT 0
#endif
#if ((defined __linux && defined(__GLIBC__)) || defined __APPLE__)
#if ((defined __linux && defined(__GLIBC__)) || defined __APPLE__)
#define USE_SETPROCTITLE
#define USE_SETPROCTITLE
#define INIT_SETPROCTITLE_REPLACEMENT
#define INIT_SETPROCTITLE_REPLACEMENT
...
...
src/memtest.c
View file @
a7b9cfbe
...
@@ -347,10 +347,15 @@ void memtest_alloc_and_test(size_t megabytes, int passes) {
...
@@ -347,10 +347,15 @@ void memtest_alloc_and_test(size_t megabytes, int passes) {
}
}
void
memtest
(
size_t
megabytes
,
int
passes
)
{
void
memtest
(
size_t
megabytes
,
int
passes
)
{
#if !defined(__HAIKU__)
if
(
ioctl
(
1
,
TIOCGWINSZ
,
&
ws
)
==
-
1
)
{
if
(
ioctl
(
1
,
TIOCGWINSZ
,
&
ws
)
==
-
1
)
{
ws
.
ws_col
=
80
;
ws
.
ws_col
=
80
;
ws
.
ws_row
=
20
;
ws
.
ws_row
=
20
;
}
}
#else
ws
.
ws_col
=
80
;
ws
.
ws_row
=
20
;
#endif
memtest_alloc_and_test
(
megabytes
,
passes
);
memtest_alloc_and_test
(
megabytes
,
passes
);
printf
(
"
\n
Your memory passed this test.
\n
"
);
printf
(
"
\n
Your memory passed this test.
\n
"
);
printf
(
"Please if you are still in doubt use the following two tools:
\n
"
);
printf
(
"Please if you are still in doubt use the following two tools:
\n
"
);
...
...
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