ncurses 5.6 - patch 20081025

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

diff --git a/c++/internal.h b/c++/internal.h
index fc7c01011730f680c0d36a7f1b379e5f1329faf5..3066e72f6de52026b17740d82108bc5f51c7bfa6 100644 (file)
--- 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-2007,2008 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 +31,30 @@
  *   Author: Juergen Pfeifer, 1997                                          *
  ****************************************************************************/
 
-// $Id: internal.h,v 1.15 2007/06/02 15:58:00 tom Exp $
+// $Id: internal.h,v 1.16 2008/10/25 21:35:44 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*/
 #endif
 
-#define CTRL(x) ((x) & 0x1f)
-
 #ifndef _QNX_SOURCE
+#include <stdlib.h>
 #include <string.h>
 #endif
 
+#ifndef CTRL
+#define CTRL(x) ((x) & 0x1f)
+#endif
+
+#ifndef NULL
+#define NULL 0
+#endif
+
 #endif /* NCURSES_CPLUS_INTERNAL_H */