Remove disabling TCP with port -1

[redis.git] / src / redis.h

diff --git a/src/redis.h b/src/redis.h
index 63041860923e81331cc4279bbc1cc1bb75a3c7eb..bfdde1a05cef3b35d1381e549dce826da08e21fc 100644 (file)
--- a/src/redis.h
+++ b/src/redis.h
@@ -329,7 +329,10 @@ struct sharedObjectsStruct {
 struct redisServer {
     pthread_t mainthread;
     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;
@@ -365,7 +368,6 @@ struct redisServer {
     struct saveparam *saveparams;
     int saveparamslen;
     char *logfile;
-    char *bindaddr;
     char *dbfilename;
     char *appendfilename;
     char *requirepass;
@@ -887,7 +889,6 @@ void watchCommand(redisClient *c);
 void unwatchCommand(redisClient *c);
 
 #if defined(__GNUC__)
-void *malloc(size_t size) __attribute__ ((deprecated));
 void *calloc(size_t count, size_t size) __attribute__ ((deprecated));
 void free(void *ptr) __attribute__ ((deprecated));
 void *malloc(size_t size) __attribute__ ((deprecated));