X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net%2Ftux%2Fproto_http.c;h=6656f8529d03c29873f8b2a5f398b8c26649352d;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=bb126ddfa0da50afaf2d57c0a9bfb8c57c4b301f;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/net/tux/proto_http.c b/net/tux/proto_http.c
index bb126ddfa..6656f8529 100644
--- a/net/tux/proto_http.c
+++ b/net/tux/proto_http.c
@@ -1012,11 +1012,11 @@ int handle_gzip_req (tux_req_t *req, unsigned int flags)
 	return 0;
 }
 
-static DEFINE_SPINLOCK(mimetypes_lock);
+static spinlock_t mimetypes_lock = SPIN_LOCK_UNLOCKED;
 
 static LIST_HEAD(mimetypes_head);
 
-static mimetype_t default_mimetype = { .type = "text/plain", .type_len = 10, .expire_str = "", .expire_str_len = 0 };
+static mimetype_t default_mimetype = { type: "text/plain", type_len: 10, expire_str: "", expire_str_len: 0 };
 
 #define MAX_MIMETYPE_LEN 128
 #define MAX_CACHE_CONTROL_AGE_LEN 30
@@ -2185,13 +2185,13 @@ out_dput:
 }
 
 tux_proto_t tux_proto_http = {
-	.defer_accept = 1,
-	.can_redirect = 1,
-	.got_request = http_got_request,
-	.parse_message = parse_http_message,
-	.illegal_request = http_illegal_request,
-	.check_req_err = http_check_req_err,
-	.print_dir_line = http_print_dir_line,
-	.name = "http",
+	defer_accept: 1,
+	can_redirect: 1,
+	got_request: http_got_request,
+	parse_message: parse_http_message,
+	illegal_request: http_illegal_request,
+	check_req_err: http_check_req_err,
+	print_dir_line: http_print_dir_line,
+	name: "http",
 };