X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=include%2Fnc_mingw.h;h=b61d67cdfa623a7b414ede50a12d795f9f3d1b1f;hp=a524da87124de0177eebcfc114a79af6fe156201;hb=5da4544722decdeb2bfd0c7c4581af0ea62148f9;hpb=da1f84b7eb32f17e91f6de242132ab3b2d462148

diff --git a/include/nc_mingw.h b/include/nc_mingw.h
index a524da87..b61d67cd 100644
--- a/include/nc_mingw.h
+++ b/include/nc_mingw.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2008,2009 Free Software Foundation, Inc.                   *
+ * Copyright (c) 2008-2017,2018 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -27,16 +27,22 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Author: Thomas Dickey, 2008-on                                           * 
- *                                                                          *
+ * Author: Thomas Dickey, 2008-on                                           *
  ****************************************************************************/
 
-/* $Id: nc_mingw.h,v 1.1 2009/02/07 23:33:19 tom Exp $ */
+/* $Id: nc_mingw.h,v 1.5 2018/06/24 00:06:37 tom Exp $ */
 
 #ifndef NC_MINGW_H
 #define NC_MINGW_H 1
 
-#define WINVER 0x0501
+#ifdef _WIN32
+#ifdef WINVER
+#  if WINVER < 0x0501
+#    error WINVER must at least be 0x0501
+#  endif
+#else
+#  define WINVER 0x0501
+#endif
 #include <windows.h>
 
 #undef sleep
@@ -45,7 +51,7 @@
 #undef gettimeofday
 #define gettimeofday(tv,tz) _nc_gettimeofday(tv,tz)
 
-#include <sys/time.h>	/* for struct timeval */
+#include <sys/time.h>		/* for struct timeval */
 
 extern int _nc_gettimeofday(struct timeval *, void *);
 
@@ -56,4 +62,10 @@ extern int _nc_gettimeofday(struct timeval *, void *);
 #define SIGKILL 9
 #define getlogin() "username"
 
+#undef wcwidth
+#define wcwidth(ucs) _nc_wcwidth(ucs)
+extern int _nc_wcwidth(wchar_t);
+
+#endif /* _WIN32 */
+
 #endif /* NC_MINGW_H */