X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fserver%2Fserver.h;h=062691b0a2c5be1df5ad854f8e26b7c9944c2f91;hp=abb501d4629cb1df59b4f41147d12db9b00f0d02;hb=38d826cec18902f719439903838ebb612575d05d;hpb=63a26b421b1731df5826a157ea633b9d2c02aaee

diff --git a/src/server/server.h b/src/server/server.h
index abb501d462..062691b0a2 100644
--- a/src/server/server.h
+++ b/src/server/server.h
@@ -38,22 +38,22 @@ enum connection_type
 	CONNECTION_PIPE
 };
 
-typedef struct connection_s
+struct connection
 {
 	int fd;
 	struct sockaddr_in sin;
 	command_context_t *cmd_ctx;
-	struct service_s *service;
+	struct service *service;
 	int input_pending;
 	void *priv;
-	struct connection_s *next;
-} connection_t;
+	struct connection *next;
+};
 
-typedef int (*new_connection_handler_t)(connection_t *connection);
-typedef int (*input_handler_t)(connection_t *connection);
-typedef int (*connection_closed_handler_t)(connection_t *connection);
+typedef int (*new_connection_handler_t)(struct connection *connection);
+typedef int (*input_handler_t)(struct connection *connection);
+typedef int (*connection_closed_handler_t)(struct connection *connection);
 
-typedef struct service_s
+struct service
 {
 	char *name;
 	enum connection_type type;
@@ -61,13 +61,13 @@ typedef struct service_s
 	int fd;
 	struct sockaddr_in sin;
 	int max_connections;
-	connection_t *connections;
+	struct connection *connections;
 	new_connection_handler_t new_connection;
 	input_handler_t input;
 	connection_closed_handler_t connection_closed;
 	void *priv;
-	struct service_s *next;
-} service_t;
+	struct service *next;
+};
 
 int add_service(char *name, enum connection_type type, unsigned short port,
 		int max_connections, new_connection_handler_t new_connection_handler,