From fbd4a0484ecbcb754406106bd849096361186586 Mon Sep 17 00:00:00 2001
From: Andrzej Rybczak <electricityispower@gmail.com>
Date: Thu, 16 Aug 2012 07:48:20 +0200
Subject: [PATCH] fix a few issues with win32 build

---
 configure.in | 9 +++------
 src/window.h | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/configure.in b/configure.in
index 417e8186..83f169fb 100644
--- a/configure.in
+++ b/configure.in
@@ -41,11 +41,9 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ]])],
 )
 CXXFLAGS="$old_CXXFLAGS $no_exceptions"
 
-
-dnl ====================================
-dnl = checking for win32 related stuff =
-dnl ====================================
-AC_CHECK_LIB(ws2_32, _head_libws2_32_a, LDFLAGS="$LDFLAGS -lws2_32", )
+dnl ==============================
+dnl = checking for regex (win32) =
+dnl ==============================
 AC_CHECK_LIB(regex, regcomp, LDFLAGS="$LDFLAGS -lregex", )
 
 dnl ================================
@@ -191,7 +189,6 @@ if test "$curl" != "no" ; then
 	fi
 fi
 
-
 dnl =======================
 dnl = checking for taglib =
 dnl =======================
diff --git a/src/window.h b/src/window.h
index 5b3f74f6..5a270691 100644
--- a/src/window.h
+++ b/src/window.h
@@ -112,7 +112,7 @@
 
 // workaraund for win32
 #ifdef WIN32
-# define wcwidth(x) 1
+# define wcwidth(x) int(!iscntrl(x))
 #endif
 
 /// Converts wide string to narrow string