Index: /branches/binary/server/memcached.c
===================================================================
--- /branches/binary/server/memcached.c (revision 746)
+++ /branches/binary/server/memcached.c (revision 752)
@@ -66,5 +66,5 @@
 static void drive_machine(conn *c);
 static int new_socket(struct addrinfo *ai);
-static int server_socket(const int port, const int prot);
+static int server_socket(const int port, enum protocol prot);
 static int try_read_command(conn *c);
 static int try_read_network(conn *c);
@@ -315,5 +315,5 @@
 
 conn *conn_new(const int sfd, const int init_state, const int event_flags,
-                const int read_buffer_size, const int prot,
+                const int read_buffer_size, enum protocol prot,
                 struct event_base *base) {
     conn *c = conn_from_freelist();
@@ -3043,5 +3043,5 @@
 }
 
-static int server_socket(const int port, const int prot) {
+static int server_socket(const int port, enum protocol prot) {
     int sfd;
     struct linger ling = {0, 0};
Index: /branches/binary/server/memcached.h
===================================================================
--- /branches/binary/server/memcached.h (revision 745)
+++ /branches/binary/server/memcached.h (revision 752)
@@ -198,5 +198,5 @@
 };
 
-enum protocols {
+enum protocol {
     ascii_prot = 3, /* arbitrary value. */
     ascii_udp_prot,
@@ -273,5 +273,5 @@
     int    suffixleft;
 
-    int protocol;   /* which protocol this connection speaks */
+    enum protocol protocol;   /* which protocol this connection speaks */
 
     /* data for UDP clients */
@@ -315,5 +315,5 @@
 char *do_add_delta(item *item, const bool incr, const int64_t delta, char *buf);
 int do_store_item(item *item, int comm);
-conn *conn_new(const int sfd, const int init_state, const int event_flags, const int read_buffer_size, const int prot, struct event_base *base);
+conn *conn_new(const int sfd, const int init_state, const int event_flags, const int read_buffer_size, enum protocol prot, struct event_base *base);
 
 
@@ -341,5 +341,5 @@
 void thread_init(int nthreads, struct event_base *main_base);
 int  dispatch_event_add(int thread, conn *c);
-void dispatch_conn_new(int sfd, int init_state, int event_flags, int read_buffer_size, int prot);
+void dispatch_conn_new(int sfd, int init_state, int event_flags, int read_buffer_size, enum protocol prot);
 
 /* Lock wrappers for cache functions that are called from main loop. */