summaryrefslogtreecommitdiffstats
path: root/contrib/ncurses/progs/progs.priv.h
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/ncurses/progs/progs.priv.h')
-rw-r--r--contrib/ncurses/progs/progs.priv.h22
1 files changed, 16 insertions, 6 deletions
diff --git a/contrib/ncurses/progs/progs.priv.h b/contrib/ncurses/progs/progs.priv.h
index f0ea460..3ead89f 100644
--- a/contrib/ncurses/progs/progs.priv.h
+++ b/contrib/ncurses/progs/progs.priv.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2011,2012 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.34 2008/08/03 17:43:05 tom Exp $
+ * $Id: progs.priv.h,v 1.39 2012/02/22 22:11:27 tom Exp $
*
* progs.priv.h
*
@@ -42,7 +42,7 @@
#if USE_RCS_IDS
#define MODULE_ID(id) static const char Ident[] = id;
#else
-#define MODULE_ID(id) /*nothing*/
+#define MODULE_ID(id) /*nothing */
#endif
#include <stdlib.h>
@@ -90,6 +90,14 @@
# endif
#endif
+#if HAVE_INTTYPES_H
+# include <inttypes.h>
+#else
+# if HAVE_STDINT_H
+# include <stdint.h>
+# endif
+#endif
+
#include <assert.h>
#include <errno.h>
@@ -99,7 +107,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.
*/
@@ -109,9 +117,11 @@ extern int optind;
#include <curses.h>
#include <term_entry.h>
+#include <nc_termios.h>
#include <tic.h>
#include <nc_tparm.h>
+#include <nc_string.h>
#include <nc_alloc.h>
#if HAVE_NC_FREEALL
#undef ExitProgram
@@ -171,7 +181,7 @@ extern int optind;
# elif defined(MAXPATHLEN)
# define PATH_MAX MAXPATHLEN
# else
-# define PATH_MAX 255 /* the Posix minimum pathsize */
+# define PATH_MAX 255 /* the Posix minimum pathsize */
# endif
#endif
@@ -183,7 +193,7 @@ extern int optind;
# if ('z'-'a' == 25) && ('z' < 127) && ('Z'-'A' == 25) && ('Z' < 127) && ('9' < 127)
# define isascii(c) (UChar(c) <= 127)
# else
-# define isascii(c) 1 /* not really ascii anyway */
+# define isascii(c) 1 /* not really ascii anyway */
# endif
#endif
OpenPOWER on IntegriCloud