ncurses 5.6 - patch 20070127

[ncurses.git] / c++ / cursesmain.cc

diff --git a/c++/cursesmain.cc b/c++/cursesmain.cc
index d10035b5f06e69c1242bc89e7197e82840eec68e..7382600b986bd7db982d77d5c90b793d89bb71da 100644 (file)
--- a/c++/cursesmain.cc
+++ b/c++/cursesmain.cc
@@ -1,6 +1,6 @@
 // * this is for making emacs happy: -*-Mode: C++;-*-
 /****************************************************************************
 // * this is for making emacs happy: -*-Mode: C++;-*-
 /****************************************************************************

- * Copyright (c) 1998-2002,2003 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2003,2007 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            *


@@ -34,7 +34,7 @@
 #include "internal.h"
 #include "cursesapp.h"
 
 #include "internal.h"
 #include "cursesapp.h"
 

-MODULE_ID("$Id: cursesmain.cc,v 1.11 2003/10/25 14:53:13 tom Exp $")
+MODULE_ID("$Id: cursesmain.cc,v 1.13 2007/01/27 20:29:27 tom Exp $")

 
 #if HAVE_LOCALE_H
 #include <locale.h>
 
 #if HAVE_LOCALE_H
 #include <locale.h>


@@ -42,6 +42,10 @@ MODULE_ID("$Id: cursesmain.cc,v 1.11 2003/10/25 14:53:13 tom Exp $")
 #define setlocale(name,string) /* nothing */
 #endif
 
 #define setlocale(name,string) /* nothing */
 #endif
 

+#if NO_LEAKS
+#include <nc_alloc.h>
+#endif
+

 /* This is the default implementation of main() for a NCursesApplication.
  * You only have to instantiate a static NCursesApplication object in your
  * main application source file and link this module with your application.
 /* This is the default implementation of main() for a NCursesApplication.
  * You only have to instantiate a static NCursesApplication object in your
  * main application source file and link this module with your application.


@@ -60,6 +64,11 @@ int main(int argc, char* argv[])
     ::endwin();
     res = (*A)();
     ::endwin();
     ::endwin();
     res = (*A)();
     ::endwin();

+#if NO_LEAKS
+    delete A;
+    _nc_free_and_exit(res);
+#else

     return(res);
     return(res);

+#endif

   }
 }
   }
 }