X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=c%2B%2B%2Finternal.h;h=1f6b4a676e52da78837ea1aaf0b31abd6f2aa430;hp=16495bcd2bbdc9bcee9939843a0275dedb602c1c;hb=7d3e03f12f3e179f5780f733fa5b78d981080d48;hpb=2639531af0c3ca25b48e7bcb9c790fa566cc5892

diff --git a/c++/internal.h b/c++/internal.h
index 16495bcd..1f6b4a67 100644
--- a/c++/internal.h
+++ b/c++/internal.h
@@ -1,6 +1,6 @@
 // * This makes emacs happy -*-Mode: C++;-*-
 /****************************************************************************
- * Copyright (c) 1998-2005,2007 Free Software Foundation, Inc.              *
+ * Copyright (c) 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,13 +31,11 @@
  *   Author: Juergen Pfeifer, 1997                                          *
  ****************************************************************************/
 
-// $Id: internal.h,v 1.14 2007/04/07 18:44:17 tom Exp $
+// $Id: internal.h,v 1.18 2012/02/23 10:41:56 tom Exp $
 
 #ifndef NCURSES_CPLUS_INTERNAL_H
 #define NCURSES_CPLUS_INTERNAL_H 1
 
-#include <stdlib.h>
-
 #include <ncurses_cfg.h>
 
 #if USE_RCS_IDS
@@ -46,10 +44,24 @@
 #define MODULE_ID(id) /*nothing*/
 #endif
 
-#define CTRL(x) ((x) & 0x1f)
+#ifdef __MINGW32__
+#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 */