ncurses 5.9 - patch 20120107

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

diff --git a/progs/progs.priv.h b/progs/progs.priv.h
index f0ea4608227d394f7ce842ec8880bb2711ccf13d..63ff9a7bedc48649de12211c9d3505da2697ebb6 100644 (file)
--- a/progs/progs.priv.h
+++ b/progs/progs.priv.h
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2007,2008 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            *
  *                                                                          *
  * 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                     *
  ****************************************************************************/
 /*
  *  Author: Thomas E. Dickey                    1997-on                     *
  ****************************************************************************/
 /*

- * $Id: progs.priv.h,v 1.34 2008/08/03 17:43:05 tom Exp $
+ * $Id: progs.priv.h,v 1.36 2011/06/26 09:31:22 tom Exp $

  *
  *     progs.priv.h
  *
  *
  *     progs.priv.h
  *


@@ -99,7 +99,7 @@ extern int errno;
 
 #if HAVE_GETOPT_H
 #include <getopt.h>
 
 #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.
  */
 /* 'getopt()' may be prototyped in <stdlib.h>, but declaring its
  * variables doesn't hurt.
  */


@@ -109,6 +109,7 @@ extern int optind;
 
 #include <curses.h>
 #include <term_entry.h>
 
 #include <curses.h>
 #include <term_entry.h>

+#include <nc_termios.h>

 #include <tic.h>
 #include <nc_tparm.h>
 
 #include <tic.h>
 #include <nc_tparm.h>