From c1d48fdce8c63a1cf1951fda4b2297214b325c63 Mon Sep 17 00:00:00 2001 From: Ryan Dahl Date: Sat, 31 Jul 2010 14:31:29 -0700 Subject: [PATCH] Changes to compile with clang --- Makefile | 14 ++++++++------ test.c | 4 ++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index dee994ea..2b945c16 100644 --- a/Makefile +++ b/Makefile @@ -1,30 +1,32 @@ OPT_DEBUG=-O0 -g -Wall -Wextra -Werror -I. OPT_FAST=-O3 -DHTTP_PARSER_STRICT=0 -I. +CC?=gcc + test: test_g ./test_g test_g: http_parser_g.o test_g.o - gcc $(OPT_DEBUG) http_parser_g.o test_g.o -o $@ + $(CC) $(OPT_DEBUG) http_parser_g.o test_g.o -o $@ test_g.o: test.c http_parser.h Makefile - gcc $(OPT_DEBUG) -c test.c -o $@ + $(CC) $(OPT_DEBUG) -c test.c -o $@ test.o: test.c http_parser.h Makefile - gcc $(OPT_FAST) -c test.c -o $@ + $(CC) $(OPT_FAST) -c test.c -o $@ http_parser_g.o: http_parser.c http_parser.h Makefile - gcc $(OPT_DEBUG) -c http_parser.c -o $@ + $(CC) $(OPT_DEBUG) -c http_parser.c -o $@ test-valgrind: test_g valgrind ./test_g http_parser.o: http_parser.c http_parser.h Makefile - gcc $(OPT_FAST) -c http_parser.c + $(CC) $(OPT_FAST) -c http_parser.c test_fast: http_parser.o test.c http_parser.h - gcc $(OPT_FAST) http_parser.o test.c -o $@ + $(CC) $(OPT_FAST) http_parser.o test.c -o $@ test-run-timed: test_fast while(true) do time ./test_fast > /dev/null; done diff --git a/test.c b/test.c index 69712172..af9f3bb4 100644 --- a/test.c +++ b/test.c @@ -1019,7 +1019,7 @@ parser_free () parser = NULL; } -inline size_t parse (const char *buf, size_t len) +size_t parse (const char *buf, size_t len) { size_t nparsed; currently_parsing_eof = (len == 0); @@ -1027,7 +1027,7 @@ inline size_t parse (const char *buf, size_t len) return nparsed; } -inline size_t parse_count_body (const char *buf, size_t len) +size_t parse_count_body (const char *buf, size_t len) { size_t nparsed; currently_parsing_eof = (len == 0);