ncurses 5.9 - patch 20110423

[ncurses.git] / progs / progs.priv.h

diff --git a/progs/progs.priv.h b/progs/progs.priv.h
index 362c3b38e64e7c66d0aed134dbcceaddf081a393..363b1b9e5df3a6c1242815eda40222faae9c454c 100644 (file)
--- a/progs/progs.priv.h
+++ b/progs/progs.priv.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2008,2011 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            *
@@ -30,7 +30,7 @@
  *  Author: Thomas E. Dickey                    1997-on                     *
  ****************************************************************************/
 /*
- * $Id: progs.priv.h,v 1.32 2007/02/03 19:59:02 tom Exp $
+ * $Id: progs.priv.h,v 1.35 2011/04/23 22:33:09 tom Exp $
  *
  *     progs.priv.h
  *
@@ -90,6 +90,7 @@
 # endif
 #endif
 
+#include <assert.h>
 #include <errno.h>
 
 #if DECL_ERRNO
@@ -98,7 +99,7 @@ extern int errno;
 
 #if HAVE_GETOPT_H
 #include <getopt.h>
-#else
+#elif !defined(HAVE_GETOPT_HEADER)
 /* 'getopt()' may be prototyped in <stdlib.h>, but declaring its
  * variables doesn't hurt.
  */
@@ -114,8 +115,12 @@ extern int optind;
 #include <nc_alloc.h>
 #if HAVE_NC_FREEALL
 #undef ExitProgram
+#ifdef USE_LIBTINFO
+#define ExitProgram(code) _nc_free_tinfo(code)
+#else
 #define ExitProgram(code) _nc_free_tic(code)
 #endif
+#endif
 
 /* usually in <unistd.h> */
 #ifndef STDOUT_FILENO