Compilation fixed on Linux after the source code split

This commit is contained in:
antirez 2010-07-01 21:13:38 +02:00
parent d3b958c3fc
commit 3688d7f308
6 changed files with 17 additions and 4 deletions

View File

@ -3,6 +3,10 @@
#include <signal.h>
#include <fcntl.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/time.h>
#include <sys/resource.h>
#include <sys/wait.h>
/* Called when the user switches from "appendonly yes" to "appendonly no"
* at runtime using the CONFIG command. */

View File

@ -1,6 +1,8 @@
#include "redis.h"
#include "sha1.h" /* SHA1 is used for DEBUG DIGEST */
#include <arpa/inet.h>
/* ================================= Debugging ============================== */
/* Compute the sha1 of string at 's' with 'len' bytes long.

View File

@ -2,6 +2,11 @@
#include "lzf.h" /* LZF compression library */
#include <math.h>
#include <sys/types.h>
#include <sys/time.h>
#include <sys/resource.h>
#include <sys/wait.h>
#include <arpa/inet.h>
int rdbSaveType(FILE *fp, unsigned char type) {
if (fwrite(&type,1,1,fp) == 0) return -1;

View File

@ -41,7 +41,6 @@
#include <assert.h>
#include <ctype.h>
#include <stdarg.h>
#include <inttypes.h>
#include <arpa/inet.h>
#include <sys/stat.h>
#include <fcntl.h>
@ -1443,8 +1442,10 @@ void *getMcontextEip(ucontext_t *uc) {
#else
return (void*) uc->uc_mcontext->__ss.__eip;
#endif
#elif defined(__i386__) || defined(__X86_64__) || defined(__x86_64__)
return (void*) uc->uc_mcontext.gregs[REG_EIP]; /* Linux 32/64 bit */
#elif defined(__i386__)
return (void*) uc->uc_mcontext.gregs[14]; /* Linux 32 */
#elif defined(__X86_64__) || defined(__x86_64__)
return (void*) uc->uc_mcontext.gregs[16]; /* Linux 64 */
#elif defined(__ia64__) /* Linux IA64 */
return (void*) uc->uc_mcontext.sc_ip;
#else

View File

@ -15,6 +15,7 @@
#include <limits.h>
#include <unistd.h>
#include <errno.h>
#include <inttypes.h>
#include "ae.h" /* Event driven programming library */
#include "sds.h" /* Dynamic safe strings */

View File

@ -551,7 +551,7 @@ void ziplistRepr(unsigned char *zl) {
if (entry.encoding == ZIP_ENC_RAW) {
fwrite(p,entry.len,1,stdout);
} else {
printf("%lld", zipLoadInteger(p,entry.encoding));
printf("%lld", (long long) zipLoadInteger(p,entry.encoding));
}
printf("\n");
p += entry.len;