ncurses 6.2 - patch 20200906

[ncurses.git] / c++ / etip.h.in

diff --git a/c++/etip.h.in b/c++/etip.h.in
index fbef35899c298dc3c5068c2f94d35dbf67a63148..6dc41042e61d6c3e33623dcb8b78b7ac4675bdce 100644 (file)
--- a/c++/etip.h.in
+++ b/c++/etip.h.in
@@ -1,6 +1,7 @@
 // * This makes emacs happy -*-Mode: C++;-*-
 /****************************************************************************
 // * This makes emacs happy -*-Mode: C++;-*-
 /****************************************************************************

- * Copyright (c) 1998-2012,2017 Free Software Foundation, Inc.              *
+ * Copyright 2018,2020 Thomas E. Dickey                                     *
+ * Copyright 1998-2012,2017 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: etip.h.in,v 1.41 2017/06/24 21:57:16 tom Exp $
+// $Id: etip.h.in,v 1.45 2020/05/24 01:40:20 anonymous.maarten Exp $

 
 #ifndef NCURSES_ETIP_H_incl
 #define NCURSES_ETIP_H_incl 1
 
 #ifndef NCURSES_ETIP_H_incl
 #define NCURSES_ETIP_H_incl 1


@@ -113,7 +114,7 @@
 #  include <generic.h>
 #endif
 
 #  include <generic.h>
 #endif
 

-#include <ncurses_dll.h>
+#include <curses.h>

 
 extern "C" {
 #if HAVE_VALUES_H
 
 extern "C" {
 #if HAVE_VALUES_H


@@ -139,11 +140,11 @@ extern "C" {
 #endif
 
 // Forward Declarations
 #endif
 
 // Forward Declarations

-class NCURSES_IMPEXP NCursesPanel;
-class NCURSES_IMPEXP NCursesMenu;
-class NCURSES_IMPEXP NCursesForm;
+class NCURSES_CXX_IMPEXP NCursesPanel;
+class NCURSES_CXX_IMPEXP NCursesMenu;
+class NCURSES_CXX_IMPEXP NCursesForm;

 
 

-class NCURSES_IMPEXP NCursesException
+class NCURSES_CXX_IMPEXP NCursesException

 {
 public:
   const char *message;
 {
 public:
   const char *message;


@@ -177,7 +178,7 @@ public:
   }
 };
 
   }
 };
 

-class NCURSES_IMPEXP NCursesPanelException : public NCursesException
+class NCURSES_CXX_IMPEXP NCursesPanelException : public NCursesException

 {
 public:
   const NCursesPanel* p;
 {
 public:
   const NCursesPanel* p;


@@ -228,7 +229,7 @@ public:
   }
 };
 
   }
 };
 

-class NCURSES_IMPEXP NCursesMenuException : public NCursesException
+class NCURSES_CXX_IMPEXP NCursesMenuException : public NCursesException

 {
 public:
   const NCursesMenu* m;
 {
 public:
   const NCursesMenu* m;


@@ -279,7 +280,7 @@ public:
   }
 };
 
   }
 };
 

-class NCURSES_IMPEXP NCursesFormException : public NCursesException
+class NCURSES_CXX_IMPEXP NCursesFormException : public NCursesException

 {
 public:
   const NCursesForm* f;
 {
 public:
   const NCursesForm* f;


@@ -340,7 +341,6 @@ using std::endl;
 #  else
 #     include <iostream.h>
 #  endif
 #  else
 #     include <iostream.h>
 #  endif

-   extern "C" void exit(int);

 #endif
 
 inline void THROW(const NCursesException *e) {
 #endif
 
 inline void THROW(const NCursesException *e) {