Merge commit '91f009a' into bfgminer · 6ee583233f - THC的仓库

Merge commit '91f009a' into bfgminer

Conflicts:
	driver-proxy.c

Luke Dashjr 12 years ago

parent

fe9c077104 91f009ab3e

commit

6ee583233f

1 changed files with 2 additions and 0 deletions

Split View Show Diff Stats

						
							+ 2
							
							- 0
						
driver-proxy.c
							 
								View File
							
				@@ -9,6 +9,8 @@
			
				 #include "config.h"
			
				+#include <unistd.h>
			
				+
			
				 #include <pthread.h>
			
				 #include <uthash.h>