Remove disabling TCP with port -1

[redis.git] / src / redis.h

diff --git a/src/redis.h b/src/redis.h
index e54caa2a2233cbae245a5a73b0d362df3f0e82e5..bfdde1a05cef3b35d1381e549dce826da08e21fc 100644 (file)
--- a/src/redis.h
+++ b/src/redis.h
@@ -15,6 +15,8 @@
 #include <limits.h>
 #include <unistd.h>
 #include <errno.h>
 #include <limits.h>
 #include <unistd.h>
 #include <errno.h>

+#include <inttypes.h>
+#include <pthread.h>

 
 #include "ae.h"     /* Event driven programming library */
 #include "sds.h"    /* Dynamic safe strings */
 
 #include "ae.h"     /* Event driven programming library */
 #include "sds.h"    /* Dynamic safe strings */


@@ -325,8 +327,12 @@ struct sharedObjectsStruct {
 
 /* Global server state structure */
 struct redisServer {
 
 /* Global server state structure */
 struct redisServer {

+    pthread_t mainthread;

     int port;
     int port;

-    int fd;
+    char *bindaddr;
+    char *unixsocket;
+    int ipfd;
+    int sofd;

     redisDb *db;
     long long dirty;            /* changes to DB from the last save */
     list *clients;
     redisDb *db;
     long long dirty;            /* changes to DB from the last save */
     list *clients;


@@ -362,7 +368,6 @@ struct redisServer {
     struct saveparam *saveparams;
     int saveparamslen;
     char *logfile;
     struct saveparam *saveparams;
     int saveparamslen;
     char *logfile;

-    char *bindaddr;

     char *dbfilename;
     char *appendfilename;
     char *requirepass;
     char *dbfilename;
     char *appendfilename;
     char *requirepass;


@@ -856,6 +861,7 @@ void blpopCommand(redisClient *c);
 void brpopCommand(redisClient *c);
 void appendCommand(redisClient *c);
 void substrCommand(redisClient *c);
 void brpopCommand(redisClient *c);
 void appendCommand(redisClient *c);
 void substrCommand(redisClient *c);

+void strlenCommand(redisClient *c);

 void zrankCommand(redisClient *c);
 void zrevrankCommand(redisClient *c);
 void hsetCommand(redisClient *c);
 void zrankCommand(redisClient *c);
 void zrevrankCommand(redisClient *c);
 void hsetCommand(redisClient *c);


@@ -882,4 +888,11 @@ void publishCommand(redisClient *c);
 void watchCommand(redisClient *c);
 void unwatchCommand(redisClient *c);
 
 void watchCommand(redisClient *c);
 void unwatchCommand(redisClient *c);
 

+#if defined(__GNUC__)
+void *calloc(size_t count, size_t size) __attribute__ ((deprecated));
+void free(void *ptr) __attribute__ ((deprecated));
+void *malloc(size_t size) __attribute__ ((deprecated));
+void *realloc(void *ptr, size_t size) __attribute__ ((deprecated));
+#endif
+

 #endif
 #endif