X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=c%2B%2B%2Finternal.h;h=70744a516376ec7b38d186ea69d90ea8c2d5ccba;hp=7eb47cdc26d8758d84314e64dc32defd386b1d11;hb=df51c7005b77c6dcc78565d8cc87f8f68a8525c2;hpb=55ccd2b959766810cf7db8d1c4462f338ce0afc8

diff --git a/c++/internal.h b/c++/internal.h
index 7eb47cdc..70744a51 100644
--- a/c++/internal.h
+++ b/c++/internal.h
@@ -1,6 +1,6 @@
 // * This makes emacs happy -*-Mode: C++;-*-
 /****************************************************************************
- * Copyright (c) 1998-2003,2005 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2012,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            *
@@ -31,7 +31,7 @@
  *   Author: Juergen Pfeifer, 1997                                          *
  ****************************************************************************/
 
-// $Id: internal.h,v 1.12 2005/08/06 22:12:25 tom Exp $
+// $Id: internal.h,v 1.19 2018/06/24 00:10:14 tom Exp $
 
 #ifndef NCURSES_CPLUS_INTERNAL_H
 #define NCURSES_CPLUS_INTERNAL_H 1
@@ -41,13 +41,27 @@
 #if USE_RCS_IDS
 #define MODULE_ID(id) static const char Ident[] = id;
 #else
-#define MODULE_ID(id) /*nothing*/
+#define MODULE_ID(id)		/*nothing */
 #endif
 
-#define CTRL(x) ((x) & 0x1f)
+#ifdef _WIN32
+#include <nc_mingw.h>
+#undef KEY_EVENT
+#endif
 
-#ifndef __EXT_QNX
+#ifndef _QNX_SOURCE
+#include <stdlib.h>
 #include <string.h>
 #endif
 
+#ifndef CTRL
+#define CTRL(x) ((x) & 0x1f)
+#endif
+
+#ifndef NULL
+#define NULL 0
+#endif
+
+#include <nc_string.h>
+
 #endif /* NCURSES_CPLUS_INTERNAL_H */