ncurses 6.1 - patch 20180623

[ncurses.git] / include / nc_mingw.h

diff --git a/include/nc_mingw.h b/include/nc_mingw.h
index 4fc921ee5ae8372f4aa044a2ad8a18c2eb402183..b61d67cdfa623a7b414ede50a12d795f9f3d1b1f 100644 (file)
--- a/include/nc_mingw.h
+++ b/include/nc_mingw.h
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 2008-2009,2010 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            *
  *                                                                          *
  * 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.2 2010/08/07 18:42:26 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
 
 
 #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
 #include <windows.h>
 
 #undef sleep


@@ -45,7 +51,7 @@
 #undef gettimeofday
 #define gettimeofday(tv,tz) _nc_gettimeofday(tv,tz)
 
 #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 *);
 
 
 extern int _nc_gettimeofday(struct timeval *, void *);
 


@@ -60,4 +66,6 @@ extern int _nc_gettimeofday(struct timeval *, void *);
 #define wcwidth(ucs) _nc_wcwidth(ucs)
 extern int _nc_wcwidth(wchar_t);
 
 #define wcwidth(ucs) _nc_wcwidth(ucs)
 extern int _nc_wcwidth(wchar_t);
 

+#endif /* _WIN32 */
+

 #endif /* NC_MINGW_H */
 #endif /* NC_MINGW_H */