ncurses 6.2 - patch 20200531

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

diff --git a/c++/internal.h b/c++/internal.h
index 67bc3ff2469e0e60672310a43d59640b46ff41cf..5cd2020d674d40fda5906cf7692c5e545bcaebc9 100644 (file)
--- a/c++/internal.h
+++ b/c++/internal.h
@@ -1,6 +1,7 @@
 // * This makes emacs happy -*-Mode: C++;-*-
 /****************************************************************************
 // * This makes emacs happy -*-Mode: C++;-*-
 /****************************************************************************

- * Copyright (c) 1998,2000 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            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -28,20 +29,40 @@
  ****************************************************************************/
 
 /****************************************************************************
  ****************************************************************************/
 
 /****************************************************************************

- *   Author: Juergen Pfeifer <juergen.pfeifer@gmx.net> 1997                 *
+ *   Author: Juergen Pfeifer, 1997                                          *

  ****************************************************************************/
 
  ****************************************************************************/
 

-// $Id: internal.h,v 1.6 2000/09/02 18:22:23 tom Exp $
+// $Id: internal.h,v 1.20 2020/02/02 23:34:34 tom Exp $

 
 

-#ifndef _CPLUS_INTERNAL_H
-#define _CPLUS_INTERNAL_H 1
+#ifndef NCURSES_CPLUS_INTERNAL_H
+#define NCURSES_CPLUS_INTERNAL_H 1
+
+#include <ncurses_cfg.h>

 
 #if USE_RCS_IDS
 #define MODULE_ID(id) static const char Ident[] = id;
 #else
 
 #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
+
+#ifdef _WIN32
+#include <nc_mingw.h>
+#undef KEY_EVENT
+#endif
+
+#ifndef _QNX_SOURCE
+#include <stdlib.h>
+#include <string.h>

 #endif
 
 #endif
 

+#ifndef CTRL

 #define CTRL(x) ((x) & 0x1f)
 #define CTRL(x) ((x) & 0x1f)

+#endif

 
 

+#ifndef NULL
+#define NULL 0

 #endif
 #endif

+
+#include <nc_string.h>
+
+#endif /* NCURSES_CPLUS_INTERNAL_H */