support for unladen swallow

unbit · May 16, 2010 · fb5ba40 · fb5ba40
1 parent 854e51f
commit fb5ba40
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 1 deletion.
diff --git a/protocol.c b/protocol.c
@@ -2,7 +2,7 @@
 
 extern struct uwsgi_server uwsgi;
 
-static size_t get_content_length(uint8_t *buf, uint16_t size) {
+static size_t get_content_length(char *buf, uint16_t size) {
 	int i;
 	size_t val = 0 ;
 	for(i=0;i<size;i++) {

diff --git a/uwsgi.c b/uwsgi.c
@@ -515,6 +515,8 @@ int main(int argc, char *argv[], char *envp[]) {
 	}
 #endif
 
+	uwsgi_log("compiled with version: %s\n", __VERSION__);
+
 #ifdef __BIG_ENDIAN__
 	uwsgi_log("*** big endian arch detected ***\n");
 #endif

diff --git a/uwsgi.h b/uwsgi.h
@@ -750,7 +750,12 @@ struct wsgi_request *find_first_available_wsgi_req(struct uwsgi_server *);
 struct wsgi_request *find_wsgi_req_by_fd(struct uwsgi_server *, int, int); 
 struct wsgi_request *find_wsgi_req_by_id(struct uwsgi_server *, int); 
 
+#ifdef __clang__
+struct wsgi_request *next_wsgi_req(struct uwsgi_server *, struct wsgi_request *);
+#else
 inline struct wsgi_request *next_wsgi_req(struct uwsgi_server *, struct wsgi_request *);
+#endif
+
 
 int async_add(int, int , int) ;
 int async_mod(int, int , int) ;
@@ -839,7 +844,11 @@ void u_green_init(struct uwsgi_server *);
 void u_green_loop(struct uwsgi_server *);
 #endif
 
+#ifdef __clang__
+struct wsgi_request *current_wsgi_req(struct uwsgi_server *);
+#else
 inline struct wsgi_request *current_wsgi_req(struct uwsgi_server *);
+#endif
 
 void sanitize_args(struct uwsgi_server *);
 

diff --git a/uwsgiconfig.py b/uwsgiconfig.py
@@ -19,6 +19,7 @@
 UGREEN=True
 STACKLESS=False
 PLUGINS = []
+USWALLOW=False
 UNBIT=False
 UWSGI_BIN_NAME = 'uwsgi'
 
@@ -63,6 +64,11 @@
 ldflags = os.environ.get("LDFLAGS", "").split()
 libs = ['-lpthread', '-rdynamic'] + sysconfig.get_config_var('LIBS').split() + sysconfig.get_config_var('SYSLIBS').split()
 
+if USWALLOW:
+	cflags = cflags + sysconfig.get_config_var('LLVM_CXXFLAGS').split()
+	ldflags = ldflags + sysconfig.get_config_var('LLVM_LDFLAGS').split() + sysconfig.get_config_var('LINKFORSHARED').split()
+	GCC = 'clang'
+
 def depends_on(what, dep):
 	for d in dep:
 		if not globals()[d]: