mirror of
https://github.com/fluencelabs/redis
synced 2025-05-29 18:21:20 +00:00
parent
cbd1607c6a
commit
b5dc2c5b91
4
deps/hiredis/fmacros.h
vendored
4
deps/hiredis/fmacros.h
vendored
@ -5,6 +5,10 @@
|
|||||||
#define _BSD_SOURCE
|
#define _BSD_SOURCE
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined(_AIX)
|
||||||
|
#define _ALL_SOURCE
|
||||||
|
#endif
|
||||||
|
|
||||||
#if defined(__sun__)
|
#if defined(__sun__)
|
||||||
#define _POSIX_C_SOURCE 200112L
|
#define _POSIX_C_SOURCE 200112L
|
||||||
#elif defined(__linux__) || defined(__OpenBSD__) || defined(__NetBSD__)
|
#elif defined(__linux__) || defined(__OpenBSD__) || defined(__NetBSD__)
|
||||||
|
2
deps/hiredis/net.h
vendored
2
deps/hiredis/net.h
vendored
@ -35,7 +35,7 @@
|
|||||||
|
|
||||||
#include "hiredis.h"
|
#include "hiredis.h"
|
||||||
|
|
||||||
#if defined(__sun)
|
#if defined(__sun) || defined(_AIX)
|
||||||
#define AF_LOCAL AF_UNIX
|
#define AF_LOCAL AF_UNIX
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -62,13 +62,19 @@ ifeq ($(uname_S),SunOS)
|
|||||||
else
|
else
|
||||||
ifeq ($(uname_S),Darwin)
|
ifeq ($(uname_S),Darwin)
|
||||||
# Darwin (nothing to do)
|
# Darwin (nothing to do)
|
||||||
|
else
|
||||||
|
ifeq ($(uname_S),AIX)
|
||||||
|
# AIX
|
||||||
|
FINAL_LDFLAGS+= -Wl,-bexpall
|
||||||
|
FINAL_LIBS+= -pthread -lcrypt -lbsd
|
||||||
|
|
||||||
else
|
else
|
||||||
# All the other OSes (notably Linux)
|
# All the other OSes (notably Linux)
|
||||||
FINAL_LDFLAGS+= -rdynamic
|
FINAL_LDFLAGS+= -rdynamic
|
||||||
FINAL_LIBS+= -pthread
|
FINAL_LIBS+= -pthread
|
||||||
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
|
||||||
|
|
||||||
|
@ -39,10 +39,14 @@
|
|||||||
#define ANET_NONE 0
|
#define ANET_NONE 0
|
||||||
#define ANET_IP_ONLY (1<<0)
|
#define ANET_IP_ONLY (1<<0)
|
||||||
|
|
||||||
#if defined(__sun)
|
#if defined(__sun) || defined(_AIX)
|
||||||
#define AF_LOCAL AF_UNIX
|
#define AF_LOCAL AF_UNIX
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef _AIX
|
||||||
|
#undef ip_len
|
||||||
|
#endif
|
||||||
|
|
||||||
int anetTcpConnect(char *err, char *addr, int port);
|
int anetTcpConnect(char *err, char *addr, int port);
|
||||||
int anetTcpNonBlockConnect(char *err, char *addr, int port);
|
int anetTcpNonBlockConnect(char *err, char *addr, int port);
|
||||||
int anetUnixConnect(char *err, char *path);
|
int anetUnixConnect(char *err, char *path);
|
||||||
|
@ -36,6 +36,10 @@
|
|||||||
#define _GNU_SOURCE
|
#define _GNU_SOURCE
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined(_AIX)
|
||||||
|
#define _ALL_SOURCE
|
||||||
|
#endif
|
||||||
|
|
||||||
#if defined(__linux__) || defined(__OpenBSD__)
|
#if defined(__linux__) || defined(__OpenBSD__)
|
||||||
#define _XOPEN_SOURCE 700
|
#define _XOPEN_SOURCE 700
|
||||||
/*
|
/*
|
||||||
|
@ -582,6 +582,10 @@ typedef struct redisOpArray {
|
|||||||
* Global server state
|
* Global server state
|
||||||
*----------------------------------------------------------------------------*/
|
*----------------------------------------------------------------------------*/
|
||||||
|
|
||||||
|
#ifdef _AIX
|
||||||
|
#undef hz
|
||||||
|
#endif
|
||||||
|
|
||||||
struct redisServer {
|
struct redisServer {
|
||||||
/* General */
|
/* General */
|
||||||
char *configfile; /* Absolute config file path, or NULL */
|
char *configfile; /* Absolute config file path, or NULL */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user