===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tic/progs.priv.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -c -r1.8 -r1.9
*** src/usr.bin/tic/progs.priv.h	2001/01/22 18:02:20	1.8
--- src/usr.bin/tic/progs.priv.h	2010/01/12 23:22:14	1.9
***************
*** 1,7 ****
! /*	$OpenBSD: progs.priv.h,v 1.8 2001/01/22 18:02:20 millert Exp $	*/
  
  /****************************************************************************
!  * Copyright (c) 1998-2000 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            *
--- 1,7 ----
! /* $OpenBSD: progs.priv.h,v 1.9 2010/01/12 23:22:14 nicm Exp $ */
  
  /****************************************************************************
!  * Copyright (c) 1998-2007,2008 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            *
***************
*** 29,38 ****
   ****************************************************************************/
  
  /****************************************************************************
!  *  Author: Thomas E. Dickey <dickey@clark.net> 1997,1998                   *
   ****************************************************************************/
  /*
!  * $From: progs.priv.h,v 1.26 2000/11/05 00:22:05 tom Exp $
   *
   *	progs.priv.h
   *
--- 29,38 ----
   ****************************************************************************/
  
  /****************************************************************************
!  *  Author: Thomas E. Dickey                    1997-on                     *
   ****************************************************************************/
  /*
!  * $Id: progs.priv.h,v 1.9 2010/01/12 23:22:14 nicm Exp $
   *
   *	progs.priv.h
   *
***************
*** 54,63 ****
  
  #if HAVE_UNISTD_H
  #include <unistd.h>
- #else
- # if HAVE_LIBC_H
- # include <libc.h>
- # endif
  #endif
  
  #if HAVE_SYS_BSDTYPES_H
--- 54,59 ----
***************
*** 73,80 ****
  #if HAVE_DIRENT_H
  # include <dirent.h>
  # define NAMLEN(dirent) strlen((dirent)->d_name)
  #else
! # define dirent direct
  # define NAMLEN(dirent) (dirent)->d_namlen
  # if HAVE_SYS_NDIR_H
  #  include <sys/ndir.h>
--- 69,85 ----
  #if HAVE_DIRENT_H
  # include <dirent.h>
  # define NAMLEN(dirent) strlen((dirent)->d_name)
+ # if defined(_FILE_OFFSET_BITS) && defined(HAVE_STRUCT_DIRENT64)
+ #  if !defined(_LP64) && (_FILE_OFFSET_BITS == 64)
+ #   define	DIRENT	struct dirent64
+ #  else
+ #   define	DIRENT	struct dirent
+ #  endif
+ # else
+ #  define	DIRENT	struct dirent
+ # endif
  #else
! # define DIRENT struct direct
  # define NAMLEN(dirent) (dirent)->d_namlen
  # if HAVE_SYS_NDIR_H
  #  include <sys/ndir.h>
***************
*** 87,92 ****
--- 92,98 ----
  # endif
  #endif
  
+ #include <assert.h>
  #include <errno.h>
  
  #if DECL_ERRNO
***************
*** 106,112 ****
--- 112,128 ----
  #include <curses.h>
  #include <term_entry.h>
  #include <tic.h>
+ #include <nc_tparm.h>
+ 
  #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
***************
*** 167,178 ****
  #if !HAVE_ISASCII
  # undef isascii
  # if ('z'-'a' == 25) && ('z' < 127) && ('Z'-'A' == 25) && ('Z' < 127) && ('9' < 127)
! #  define isascii(c) (CharOf(c) <= 127)
  # else
  #  define isascii(c) 1	/* not really ascii anyway */
  # endif
  #endif
  
! #define CharOf(c)    ((unsigned char)(c))
  
  #define SIZEOF(v) (sizeof(v)/sizeof(v[0]))
--- 183,194 ----
  #if !HAVE_ISASCII
  # undef isascii
  # 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 */
  # endif
  #endif
  
! #define UChar(c)    ((unsigned char)(c))
  
  #define SIZEOF(v) (sizeof(v)/sizeof(v[0]))