From 0258fae450d8f3164f5a6706a65e80e10f016528 Mon Sep 17 00:00:00 2001
From: Jeff Garzik <jeff@garzik.org>
Date: Mon, 14 Mar 2011 23:36:28 -0400
Subject: Fix Windows build, that broke with yasm integration

---
 Makefile.am  | 3 +++
 configure.ac | 1 +
 cpu-miner.c  | 1 -
 miner.h      | 1 +
 util.c       | 1 -
 5 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 73d3b8b..04a45da 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,8 +20,11 @@ minerd_SOURCES	= elist.h miner.h compat.h			\
 minerd_LDFLAGS	= $(PTHREAD_FLAGS)
 minerd_LDADD	= @LIBCURL@ @JANSSON_LIBS@ @PTHREAD_LIBS@
 
+if HAVE_WINDOWS
+else
 if HAS_YASM
 SUBDIRS		+= x86_64
 minerd_LDADD	+= x86_64/libx8664.a
 AM_CFLAGS	= -DHAS_YASM
 endif
+endif
diff --git a/configure.ac b/configure.ac
index 721cb0d..15a25a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,6 +33,7 @@ AC_CHECK_LIB(jansson, json_loads, request_jansson=false, request_jansson=true)
 AC_CHECK_LIB(pthread, pthread_create, PTHREAD_LIBS=-lpthread)
 
 AM_CONDITIONAL([WANT_JANSSON], [test x$request_jansson = xtrue])
+AM_CONDITIONAL([HAVE_WINDOWS], [test x$have_win32 = xtrue])
 
 if test x$request_jansson = xtrue
 then
diff --git a/cpu-miner.c b/cpu-miner.c
index a78be29..652c35b 100644
--- a/cpu-miner.c
+++ b/cpu-miner.c
@@ -21,7 +21,6 @@
 #ifndef WIN32
 #include <sys/resource.h>
 #endif
-#include <pthread.h>
 #include <getopt.h>
 #include <jansson.h>
 #include <curl/curl.h>
diff --git a/miner.h b/miner.h
index 118fc36..52be480 100644
--- a/miner.h
+++ b/miner.h
@@ -4,6 +4,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <sys/time.h>
+#include <pthread.h>
 #include <jansson.h>
 #include <curl/curl.h>
 
diff --git a/util.c b/util.c
index 5d97403..55e602c 100644
--- a/util.c
+++ b/util.c
@@ -14,7 +14,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <pthread.h>
 #include <jansson.h>
 #include <curl/curl.h>
 #include "miner.h"
-- 
cgit v1.2.3-18-g5258