ncurses 6.5 - patch 20240504

[ncurses.git] / include / nc_win32.h

diff --git a/include/nc_win32.h b/include/nc_win32.h
index 1a0ba495913e16c5cb8e786183adb0615a3faf89..f069d5043ef6541af341b6c47b034bcd6cb51b9b 100644 (file)
--- a/include/nc_win32.h
+++ b/include/nc_win32.h
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright 2018-2019,2020 Thomas E. Dickey                                *
+ * Copyright 2018-2023,2024 Thomas E. Dickey                                *

  * Copyright 2008-2010,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * Copyright 2008-2010,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *


@@ -31,7 +31,7 @@
  * Author: Thomas Dickey, 2008-on                                           *
  ****************************************************************************/
 
  * Author: Thomas Dickey, 2008-on                                           *
  ****************************************************************************/
 

-/* $Id: nc_win32.h,v 1.8 2020/09/07 14:27:05 tom Exp $ */
+/* $Id: nc_win32.h,v 1.12 2024/05/04 19:17:03 tom Exp $ */

 
 #ifndef NC_WIN32_H
 #define NC_WIN32_H 1
 
 #ifndef NC_WIN32_H
 #define NC_WIN32_H 1


@@ -73,19 +73,25 @@
 #include <winsock2.h>          /* for struct timeval */
 #endif
 
 #include <winsock2.h>          /* for struct timeval */
 #endif
 

+#include <stdint.h>            /* for uint32_t */
+

 #ifdef __cplusplus
 extern "C" {
 #endif
 
 #include <ncurses_dll.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 #include <ncurses_dll.h>
 

+#if !HAVE_CLOCK_GETTIME && !HAVE_GETTIMEOFDAY

 #undef HAVE_GETTIMEOFDAY
 #undef HAVE_GETTIMEOFDAY

-#define HAVE_GETTIMEOFDAY 1
+#define HAVE_GETTIMEOFDAY 2

 extern NCURSES_EXPORT(int) _nc_gettimeofday(struct timeval *, void *);
 extern NCURSES_EXPORT(int) _nc_gettimeofday(struct timeval *, void *);

+#endif

 
 #undef wcwidth
 #define wcwidth(ucs)  _nc_wcwidth((wchar_t)(ucs))
 
 #undef wcwidth
 #define wcwidth(ucs)  _nc_wcwidth((wchar_t)(ucs))

-extern NCURSES_EXPORT(int)    _nc_wcwidth(wchar_t);
+extern NCURSES_EXPORT(int)    _nc_wcwidth(uint32_t);
+
+#ifdef EVENTLIST_2nd /* test.priv.h just needs the preceding */

 
 extern NCURSES_EXPORT(void)   _nc_console_size(int* Lines, int* Cols);
 extern NCURSES_EXPORT(HANDLE) _nc_console_handle(int fd);
 
 extern NCURSES_EXPORT(void)   _nc_console_size(int* Lines, int* Cols);
 extern NCURSES_EXPORT(HANDLE) _nc_console_handle(int fd);


@@ -170,6 +176,8 @@ extern NCURSES_EXPORT_VAR(ConsoleInfo) _nc_CONSOLE;
 
 #define TypeAlloca(type,count)(type*) _alloca(sizeof(type)*(size_t)(count))
 
 
 #define TypeAlloca(type,count)(type*) _alloca(sizeof(type)*(size_t)(count))
 

+#endif /* EVENTLIST_2nd */
+

 #ifdef __cplusplus
 }
 #endif
 #ifdef __cplusplus
 }
 #endif