Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

haiku support in redis, also a fairly large bug in some cases #62

Open
wants to merge 5 commits into from

1 participant

@jrabbit

The first four commits are from my work on stable, the last is a bug in unstable.

Haiku OS: http://haiku-os.org/

PS: If I screwed up by forgetting to do a topic branch lemme know how to transpose these commits there, thanks.

@harrigan harrigan referenced this pull request
Closed

redis 2.4.1 make error #143

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jun 23, 2011
  1. @jrabbit

    haiku specific makefile rules that use -lroot and -lnetwork instead o…

    jrabbit authored
    …f -lm, -lpthread and -lsocket
  2. @jrabbit

    POSIX defined wait3 equivalent

    jrabbit authored
  3. @jrabbit

    u_int32_t issue

    jrabbit authored
  4. @jrabbit

    endif is kinda important

    jrabbit authored
  5. @jrabbit

    typos

    jrabbit authored
This page is out of date. Refresh to see the latest.
View
10 deps/hiredis/Makefile
@@ -26,6 +26,15 @@ ifeq ($(uname_S),Darwin)
STLIBNAME?=libhiredis.a
STLIB_MAKE_CMD?=libtool -static -o ${STLIBNAME} - ${OBJ}
else
+ifeq ($(uname_S),Haiku)
+ CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -fPIC -Wall -W -Wstrict-prototypes -Wwrite-strings $(ARCH) $(PROF)
+ CCLINK?=-lroot -lnetwork
+ LDFLAGS?=-L. -Wl,-rpath,.
+ DYLIBNAME?=libhiredis.so
+ DYLIB_MAKE_CMD?=gcc -shared -Wl,-soname,${DYLIBNAME} -o ${DYLIBNAME} ${OBJ}
+ STLIBNAME?=libhiredis.a
+ STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ}
+else
CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -fPIC -Wall -W -Wstrict-prototypes -Wwrite-strings $(ARCH) $(PROF)
CCLINK?=-lm -pthread
LDFLAGS?=-L. -Wl,-rpath,.
@@ -35,6 +44,7 @@ else
STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ}
endif
endif
+endif
CCOPT= $(CFLAGS) $(CCLINK)
DEBUG?= -g -ggdb
View
8 src/Makefile
@@ -15,12 +15,18 @@ endif
ifeq ($(uname_S),SunOS)
CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -Wall -W -D__EXTENSIONS__ -D_XPG6
CCLINK?=-ldl -lnsl -lsocket -lm -lpthread
- DEBUG?=-g -ggdb
+ DEBUG?=-g -ggdb
+else
+ifeq ($(uname_S),Haiku)
+ CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -Wall -W $(ARCH) $(PROF)
+ CCLINK?=-lroot -lnetwork
+ DEBUG?=-g -ggdb
else
CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -Wall -W $(ARCH) $(PROF)
CCLINK?=-lm -pthread
DEBUG?=-g -rdynamic -ggdb
endif
+endif
ifeq ($(USE_TCMALLOC),yes)
ALLOD_DEPS=
View
2  src/aof.c
@@ -25,7 +25,7 @@ void stopAppendOnly(void) {
int statloc;
if (kill(server.bgrewritechildpid,SIGKILL) != -1)
- wait3(&statloc,0,NULL);
+ waitpid(&statloc,0,NULL);
/* reset the buffer accumulating changes while the child saves */
sdsfree(server.bgrewritebuf);
server.bgrewritebuf = sdsempty();
View
2  src/redis.c
@@ -646,7 +646,7 @@ int serverCron(struct aeEventLoop *eventLoop, long long id, void *clientData) {
int statloc;
pid_t pid;
- if ((pid = wait3(&statloc,WNOHANG,NULL)) != 0) {
+ if ((pid = waitpid(&statloc,WNOHANG,NULL)) != 0) {
int exitcode = WEXITSTATUS(statloc);
int bysignal = 0;
View
3  src/sha1.c
@@ -27,6 +27,9 @@ A million repetitions of "a"
#if defined(__sun)
#include "solarisfixes.h"
#endif
+#ifdef __HAIKU__
+#include <stdint.h>
+#endif
#include "sha1.h"
#include "config.h"
View
2  src/util.c
@@ -317,7 +317,7 @@ int d2string(char *buf, size_t len, double value) {
* integer printing function that is much faster. */
double min = -4503599627370495; /* (2^52)-1 */
double max = 4503599627370496; /* -(2^52) */
- if (val > min && val < max && value == ((double)((long long)value)))
+ if (value > min && value < max && value == ((double)((long long)value)))
len = ll2string(buf,len,(long long)value);
else
#endif
Something went wrong with that request. Please try again.