Browse Source

Make sure MOUSE_MOVED from wincon is ignored (it conflicts with curses)

"#undef" in config header template is commented out, so we need to hide it behind #include
Luke Dashjr 11 years ago
parent
commit
9b0a29a722
3 changed files with 17 additions and 1 deletions
  1. 4 0
      Makefile.am
  2. 1 1
      configure.ac
  3. 12 0
      winhacks.h

+ 4 - 0
Makefile.am

@@ -104,6 +104,10 @@ EXTRA_bfgminer_DEPENDENCIES += $(libbase58_EXTRADEPS) $(libblkmaker_EXTRADEPS)
 
 bfgminer_SOURCES	+= logging.c
 
+if HAVE_WINDOWS
+bfgminer_SOURCES += winhacks.h
+endif
+
 if USE_UDEVRULES
 dist_udevrules_DATA = 70-bfgminer.rules
 endif

+ 1 - 1
configure.ac

@@ -34,7 +34,7 @@ AC_CONFIG_HEADERS([config.h])
 
 AH_BOTTOM([
 #ifdef WIN32
-#include <winsock2.h>
+#include "winhacks.h"
 #endif
 ])
 

+ 12 - 0
winhacks.h

@@ -0,0 +1,12 @@
+#ifndef BFG_WINHACKS_H
+#define BFG_WINHACKS_H
+
+#include <winsock2.h>
+
+// wincon.h contains a MOUSE_MOVED that conflicts with curses
+#include <wincon.h>
+#ifdef MOUSE_MOVED
+#	undef MOUSE_MOVED
+#endif
+
+#endif