ncurses 6.2 - patch 20200215

[ncurses.git] / c++ / internal.h

diff --git a/c++/internal.h b/c++/internal.h
index fc7c01011730f680c0d36a7f1b379e5f1329faf5..5cd2020d674d40fda5906cf7692c5e545bcaebc9 100644 (file)
--- a/c++/internal.h
+++ b/c++/internal.h
@@ -1,6 +1,7 @@
 // * This makes emacs happy -*-Mode: C++;-*-
 /****************************************************************************
- * Copyright (c) 1998-2005,2007 Free Software Foundation, Inc.              *
+ * Copyright 2018,2020 Thomas E. Dickey                                     *
+ * Copyright 1998-2008,2012 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,25 +32,37 @@
  *   Author: Juergen Pfeifer, 1997                                          *
  ****************************************************************************/
 
-// $Id: internal.h,v 1.15 2007/06/02 15:58:00 tom Exp $
+// $Id: internal.h,v 1.20 2020/02/02 23:34:34 tom Exp $
 
 #ifndef NCURSES_CPLUS_INTERNAL_H
 #define NCURSES_CPLUS_INTERNAL_H 1
 
 #include <ncurses_cfg.h>
 
-#include <stdlib.h>
-
 #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 _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 */