ncurses 6.2 - patch 20200907

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

diff --git a/c++/internal.h b/c++/internal.h
index 921389c81fb7ce0e09e7b57550caff69a069d438..f67aaec3d99f0ac51b2a1e919086f2c1154a5165 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-2002,2003 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            *


@@ -31,7 +32,7 @@
  *   Author: Juergen Pfeifer, 1997                                          *
  ****************************************************************************/
 
  *   Author: Juergen Pfeifer, 1997                                          *
  ****************************************************************************/
 

-// $Id: internal.h,v 1.10 2003/10/25 15:04:46 tom Exp $
+// $Id: internal.h,v 1.22 2020/08/29 23:06:41 tom Exp $

 
 #ifndef NCURSES_CPLUS_INTERNAL_H
 #define NCURSES_CPLUS_INTERNAL_H 1
 
 #ifndef NCURSES_CPLUS_INTERNAL_H
 #define NCURSES_CPLUS_INTERNAL_H 1


@@ -41,9 +42,31 @@
 #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
 
 #endif
 

+#if (defined(_WIN32) || defined(_WIN64))
+#if defined(EXP_WIN32_DRIVER)
+#include <nc_win32.h>
+#else
+#include <nc_mingw.h>
+#endif
+#undef KEY_EVENT
+#endif
+
+#ifndef _QNX_SOURCE
+#include <stdlib.h>
+#include <string.h>
+#endif
+
+#ifndef CTRL

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

+#endif
+
+#ifndef NULL
+#define NULL 0
+#endif
+
+#include <nc_string.h>

 
 

-#endif // NCURSES_CPLUS_INTERNAL_H
+#endif /* NCURSES_CPLUS_INTERNAL_H */